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