Removed some stuff from the todo