[PLAT-6857] Remove code in deprecated folders and patch up