remove some more fat from templates