Aligning socket namespaces with endpoints, removing socket demo