Switch away from heap vector