Unused templates cleanup