Merge changes I49660236,I56a7970a

* changes:
  Delete unused code.
  Unhide setting for CTS testing.