socket fields removed and local variables added