Templates clenup