Removing some todos