leftover template simplifications