reconfigured to accomodate DB cleaner