Merge "Delete unused/non-working code." into lmp-mr1-dev