Cleanup, moving on with 0.5.0-SNAPSHOT