Remove old Template class (merged with View)