sample env cleanup

Resolves issue #626