LPS-46133 SF: remove variables whose value can be used directly