WIP some cleanup
WIP more cleanup. Externalizing environment variables using foreman