Remove no longer relevant TODOs