Removed unnecessary todos.
Fixed merge conflict when pulling develop branch.