Remove some legacy code.