Remove execute_or_start