Remove unused methods and callbacks
am: 98aa0dd

* commit '98aa0ddd6c3993ea43fdac6075a6d2b8725231bc':
  Remove unused methods and callbacks