Cleaning up some of the mass commit mess