Big refactor: remove Subscriber class

1 job for master in 2 minutes and 31 seconds