cleaned up some todos