SOS-1574 Removing clean up logic tamporarily until markekplacce fixes the upgrade logic
SOS-1574 SF