removed legacy RP structure