Removed some done todos