am 7a139757: Cleanup unused import and dead code

* commit '7a13975700574c42ff1e9cfff5934f00ffb3c802':
  Cleanup unused import and dead code