Hawk PR cleanup