Merge changes from topic "remove unwanted APIs"

* changes:
  Removed dead code
  Remove implementation of unwanted APIs