Removing AWS Env