Template class clean up