Offload references to its own class
Strip RP2 support