cleanup, Fixes #2