remove some more raw pointers