Removed references to old TVNamer