more socket subscription mgmt fixes, cleanup