am c843ca45: Remove some dead code

* commit 'c843ca452a2c1667310246bf85c8eb50656ab7a6':
  Remove some dead code