fixup! linearize cluster updates and refactor Deallocators