Cleaning up some todos