Remove old code which used smelly non config based services.
Add some socks support. (Untested.)