cleanup
simplify API — execution environment is enough