Remove unused abstract class