first commit after cleanup