Tidy the object model for decentral.