Remove hard-coded state default