replace vars with functions
removing client config as it's no longer used