upgrade to 2.0.10
Add all needed classes to the built jar
Remove useless imports/code