Removed need for executor parameter