Removing unused Base Class