Removing PR code that broke some paths