Final commit (clean all)