commit before code cleanup