Commits fixed, clean up started.