Clean up abstract class and interface