Clean up based on TODO.
Merge pull request #1615 from edx/feanil/env_update

Clean up based on TODO.