Deleted some more classes and made some minor changes.