Back to abstract class
Removing unused dependency