Removed old base classes