remove hard coded environment and pull from server config