Started working on removing env_prod