Removing HasDispatcherTrait from several classes