Slowly burning away the override nonsense. A surprising amount can be just deleted.