Added a todo and removed a wee bit of code