am 759356bb: Merge "Cleanup: Delete dead code." into lmp-dev

* commit '759356bbd889d780a57c51c19761b32cbba8e6ef':
  Cleanup: Delete dead code.