Remove some vestiges of pre-object strategy.