More removing unneeded fixes.