Removed remnants of lecagy subscriptions. Completed refactoring of clients registering and
related reporting in clients. TODOs in previous commit remain.