cleanup + move to apps as (env) -> Response