Final commit for cleanup