Cleanup

fixes #5