Updated packages.
Removed unnecessary classes.