* Fix NPE when browser cookie is disabled
* Remove redundant classes