Revised Commit after cleanup