Remove some RT API calls