Remove env_trampoline
Merge branch 'fix-cleanup-build'
Whoops, forgot statem
Merge branch 'feature-add-statem'