clean up and commit