Add TODO to remove last of StandardTemplate references