am 86868057: Merge "Removing dead code"

* commit '86868057c2cd9cb6d0b0a81436bc5abd7c7af94e':
  Removing dead code