Revert "States Enabled"

This reverts commit 174787dcadc44a2e9fe3c834fee36539a712d865.