Deactivated allocator code, changed some functions to utilize sortedvectors interface