Remove plenty of overrides that are now obsolete.