removing open-coded STATE access