LRSUPPORT-8106 Simplify scripts