remove no longer relevant TODOs