Cleanup, 0.4.0