More PR code cleanup