Removed TODOs to highlight the regressions made when moving back to the 1.0 version of the rest interface.