Add a TODO note on a class rename to perform

Although this particular class is not used anywhere at the moment... Maybe
remove it?