Commit before cleansing the workspace
Prepare for transition to scala