Template cleanup
More template cleanup