remove org
mark getActiveSocket() as public