More template cleanup
More template cleanup