Forced clean up of runtime config dictionary which includes a local client

/cc @cachedout, @rallytime 

Let's see if this solves our tests issues....