Remove TODO comment
Cleaup several qDebug calls and commented lines