Removed hard coded environment paths