Over Ridden Templates

I have an issue where I locally define a template as I want to change one aspect of the template. 

In the past I would override the template and it would remove the main template and put a locally defined one in place. Now when I do the same action, It keeps the old template there (The device bound template for the class) and adds the local template. I can then adjust the data on the local template but since the original template is still there, it over rides the locally defined.