Cleanup of initial commit