cleanup. Started to add UDP support back in