Removed leftover and unnecessarz todos.