Also some blueprint and template cleanup