Removed unneeded abstract class