cleans up some todos