Mostly removing old TODOs