LPS-50861 Simplify

Hey @Preston-Crary can you please check my changes?
If they look good please fwd them to Brian!
Thx!