Remove Adaptor and update their own class (PubSub)