Removed TODO line since we are deprecating the class and it is no longer relevant.