Merge changes I53236e23,If5b84b90,Ia38f8aab

* changes:
  Remove debug code
  Remove more unused code
  Remove unused code