Removed a lot of old deprecated classes