Remove usage of mb* #6