Cleanup code
* No modified files are living under etc
* Use a replace/search for template files supporting env vars