More template cleanup wooooo!