clean up some todos