Remove even more ptr_vectors