LPS-50227 simplify