* Remove redudant classes
* Upgrade project version to 4.1.1