MADS: Remove some redundant TODOs