More cleanup & disabled UDP sockets pending a rewrite.