socket removed where unnecessary