Removed several unused classes.
Merge remote-tracking branch 'origin/master'