Some cleanup for the last push.