Template cleanup

This removes the tempalte overrides we should no longer need, and cleans up some unnessecary differences between the template overrides and the base wafer templates.