Cleanup pass after inital commit - not working