Commit before cleanup