Tidy up config to reduce redundancy
Much better transparent proxying solution.