Fix issue #88 - cleanup