cleaning up template+plugin verification