Clean up template removal a tad

Did what I could, let me know if it works