Use 'toggle references'; remove custom denaturation-fighting code from subclassing