Remove 'fix' code that never really went anywhere.