SM: simplify and fix client (subsystem servers) management.