Fixed socket timeout setting and removed hardcoded part