Updating allocator
Removed unused states