revert excessive cleanup - issue #151