am 1601d500: am 856a39b8: am 4c4c001a: removing dead code

* commit '1601d500e26c29522b94cc843e5fece3bca5c505':
  removing dead code