Bump to 3.0.80
Remove patch leftovers