cleanup — use ExecutionEnvironmentBuilder