Deleted some classes that are no longer needed.
Merge origin/master