Removing unneeded macros. Config singletons as templates