Remove rp2 dependencies