more refactoring, remove unneeded stuff from subscribe-only client