(PUP-3260) Remove RRD functionality