Remove state class helper. Just use state instead.