Cleanup, 0.2.1