Removed old abstraction class