Clean up
Version update to 3.98.0
Remove unused patch