[TASK] Remove unneeded abstract class