worldstate_picker: removing unnecessary checks
worldstate_picker: cosmetic changes