Removed some todos