removed some todos