Removed a todo and a clearpage :]