Removing Classes

Removing Old classes we don't use anymore
Merge remote-tracking branch 'origin/wettrix-branch'