Remove abstract class as not a shared abstraction