Remove some dead code remnants.