Merge "Delete some unused references." into lmp-mr1-dev