Fix "call to undefined getUserStateFromRequest()" - `@todo` remove..
Cleanup
Merge branch 'master' into bt3