Fixup build script and remove old todo.