Remove commented out sections from last refactor.
Remove commented out sections from last refactor.


Former-commit-id: 177288e435c9058397ef793fb07af400535cde65 [formerly 87cb223801702a99fc064ad2ed7d6632e15a289b]
Former-commit-id: 6e2a27df8f0367ac02269fa2bf53070a8affe2db
tourdrone/cvdrone,tourdrone/cvdrone