2: Fix cleanup & sync of embedded objects