Remove unnecessary abstract class