Assassination code cleanup