Removed socket stuff