[PLAT-6820] Remove commented out code