Removing Classes

Removing Old classes we don't use anymore