layers: UniqueObject updates based on review

Remove all of the DebugReport stuff, this layer doesn't use it.
Update some corner cases to make sure objects are correctly restored.
2 files changed