Removed as much secondary templating as possible...