#276: #86: additional cleanup

opened by thuchacz