Template cleanup and auto-load tweak