Removed some todos for presentation