Removing the dependency on the templates plugin that was accidentally left over in some tests and baked files