Commit before cleaning up