Cleanup, Final commit