Final commit after cleanup