Initial cleanup and commit