Removing pointers, WIP