Remove todos not needed anymore
Trigger buildbot