PLAT-4091 - Remove redundant class