MULE-7728: Fixed several clean up problems related to partitioned object...

... storages.
this is repeated at least twice, would it make sense to have a constant?