Remove some completed / obsolete TODOs