code cleanup related to fetching data by environment only - need backend side changes support backwards compatibility