RP: Removing more pointers