Removed some tcp specific code