[PLAT-4420] Remove temporary code now that normalisation in place