Merge changes I34732bdb,Ieafd3be6

* changes:
  Remove some unused code
  Remove unused slice metadata