Clean up environment variables