What are you afraid of in terms of eliminating reference to the KGB and Hoover's alleged homosexuality? Not making him look like a buffoon. Perhaps you have no understanding of the KGB and its tactics.  
 For example, the recent admissions from the KGB archives show that it was behind the myth that Pius XII did nothing to help the Jews during the Holocaust, an assertion that is baseless in fact.