Cleanup of cleanup

based on #2