Remove duplicate execute handling code