removing some todos