Committing clean up