clean up commit round 2