LPS-35351

...and remove unnecessary default state settings