Getting diagnostic tools to run in EdgeGrid world
Cleaning up extra config stuff