Remove deprecated environment variables