Some cleanup...
Upgraded java removed unused classes.