Remove old code from ConsumerBase