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