Remove todos from master branch