Removed stupid todo-comments