Before physicloud cleanup!