removing env specific stuff and keeping things local