Cleaned up old classes

Removed all unecessary code from old classes