Merge "Remove dead code 3." into lmp-dev