These old ones need to be removed still and all TContent refs need updated in these when refactor occurs.