If Khashoggi was the kind of guy we around here think he was then the CIA would surely have a very interesting file on him.
I think the best and fastest way to clean up this situation is for PUTUS to declassify that file with minimum redactions.
The Hatch Act make's an explicit exception for the President.