-updated tools
-removed some unused classes