Changing this file to work over tcp
Clearing extra stuff