Commit before cleanup

because fuck logic