Cleanup: One less abstract base class
Refactoring