Remove Builder from middleware module