sample env cleanup
Merge pull request #627 from bczulauf/env

sample env cleanup