Revert "New states will now initialise and load in SwitchState."

This reverts commit 7c3565b366dfc85d5b4615ee271eaf37a910b51d.