WIP: Removing allocator templates