cleanup remaining Template stuff