Remove map usage via pointers