got rid of all that pesky code in the PubSub (testing)