Remove some dead code from older version.