Merge "Remove unused methods and callbacks"
am: 5f735636de

* commit '5f735636de456c2a5fdf0bb9728778607662bd53':
  Remove unused methods and callbacks