Clean up some bus stuff. SelfHandling contract.