Clean up obsolete code in execute functions.