Removed old, refactored classes.