Cleaning up environment reporting