remove some now-unnecessary templates