Fixup: Remove allocator