REV3: Remove / address any TODO's that are quick-win.