Cleaned up environment config.