Cleanup for 0.1.0-SNAPSHOT