Remove socketPool and added socketMap