[TASK] Remove superfluous classes