get rid of some todos