Quick template scan and cleanup - more to come!