[PLAT-3555] Removing unused code