Merge change Ia4c68278

* changes:
  Remove dead code.