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