Reduce downgrade rules

Reduce the number of downgrade rules.
Delete rather than comment out?