Fix build. Needs checking if rooting is correct.

Remove some useless TODOs.