Remove pointer indirection, use local package