Fix "call to undefined getUserStateFromRequest()" - `@todo` remove..
Cleanup