Remove pubsub and buttons