Merge "Remove one line of unused code." into lmp-sprout-dev