Get rid of a now unused todo and fix a compile warning