* Update mobile
* Fixed broken unit tests
* Remove redundant classes