Some more cleanup for setInitState