Merge changes from topic "unused_sm_methods"

* changes:
  Removed unused methods
  Removed unused methods