diff --git a/synapse/models/risk.py b/synapse/models/risk.py
index 82f8a77be6..ad504966e4 100644
--- a/synapse/models/risk.py
+++ b/synapse/models/risk.py
@@ -560,116 +560,6 @@ def getModelDefs(self):
                     ('cvss:v3_1:score:environmental', ('float', {}), {
                         'doc': 'The CVSS v3.1 environmental score for the vulnerability.'}),
 
-                    ('cvss:av', ('str', {'enums': 'N,A,P,L'}), {
-                        'deprecated': True,
-                        'doc': 'Deprecated. Please use :cvss:v3.'}),
-
-                    ('cvss:ac', ('str', {'enums': 'L,H'}), {
-                        'disp': {'enums': (('Low', 'L'), ('High', 'H'))},
-                        'deprecated': True,
-                        'doc': 'Deprecated. Please use :cvss:v3.'}),
-
-                    ('cvss:pr', ('str', {'enums': 'N,L,H'}), {
-                        'disp': {'enums': (
-                            {'title': 'None', 'value': 'N', 'doc': 'FIXME privs stuff'},
-                            {'title': 'Low', 'value': 'L', 'doc': 'FIXME privs stuff'},
-                            {'title': 'High', 'value': 'H', 'doc': 'FIXME privs stuff'},
-                        )},
-                        'deprecated': True,
-                        'doc': 'Deprecated. Please use :cvss:v3.'}),
-
-                    ('cvss:ui', ('str', {'enums': 'N,R'}), {
-                        'deprecated': True,
-                        'doc': 'Deprecated. Please use :cvss:v3.'}),
-
-                    ('cvss:s', ('str', {'enums': 'U,C'}), {
-                        'deprecated': True,
-                        'doc': 'Deprecated. Please use :cvss:v3.'}),
-
-                    ('cvss:c', ('str', {'enums': 'N,L,H'}), {
-                        'deprecated': True,
-                        'doc': 'Deprecated. Please use :cvss:v3.'}),
-
-                    ('cvss:i', ('str', {'enums': 'N,L,H'}), {
-                        'deprecated': True,
-                        'doc': 'Deprecated. Please use :cvss:v3.'}),
-
-                    ('cvss:a', ('str', {'enums': 'N,L,H'}), {
-                        'deprecated': True,
-                        'doc': 'Deprecated. Please use :cvss:v3.'}),
-
-                    ('cvss:e', ('str', {'enums': 'X,U,P,F,H'}), {
-                        'deprecated': True,
-                        'doc': 'Deprecated. Please use :cvss:v3.'}),
-
-                    ('cvss:rl', ('str', {'enums': 'X,O,T,W,U'}), {
-                        'deprecated': True,
-                        'doc': 'Deprecated. Please use :cvss:v3.'}),
-
-                    ('cvss:rc', ('str', {'enums': 'X,U,R,C'}), {
-                        'deprecated': True,
-                        'doc': 'Deprecated. Please use :cvss:v3.'}),
-
-                    ('cvss:mav', ('str', {'enums': 'X,N,A,L,P'}), {
-                        'deprecated': True,
-                        'doc': 'Deprecated. Please use :cvss:v3.'}),
-
-                    ('cvss:mac', ('str', {'enums': 'X,L,H'}), {
-                        'deprecated': True,
-                        'doc': 'Deprecated. Please use :cvss:v3.'}),
-
-                    ('cvss:mpr', ('str', {'enums': 'X,N,L,H'}), {
-                        'deprecated': True,
-                        'doc': 'Deprecated. Please use :cvss:v3.'}),
-
-                    ('cvss:mui', ('str', {'enums': 'X,N,R'}), {
-                        'deprecated': True,
-                        'doc': 'Deprecated. Please use :cvss:v3.'}),
-
-                    ('cvss:ms', ('str', {'enums': 'X,U,C'}), {
-                        'deprecated': True,
-                        'doc': 'Deprecated. Please use :cvss:v3.'}),
-
-                    ('cvss:mc', ('str', {'enums': 'X,N,L,H'}), {
-                        'deprecated': True,
-                        'doc': 'Deprecated. Please use :cvss:v3.'}),
-
-                    ('cvss:mi', ('str', {'enums': 'X,N,L,H'}), {
-                        'deprecated': True,
-                        'doc': 'Deprecated. Please use :cvss:v3.'}),
-
-                    ('cvss:ma', ('str', {'enums': 'X,N,L,H'}), {
-                        'deprecated': True,
-                        'doc': 'Deprecated. Please use :cvss:v3.'}),
-
-                    ('cvss:cr', ('str', {'enums': 'X,L,M,H'}), {
-                        'deprecated': True,
-                        'doc': 'Deprecated. Please use :cvss:v3.'}),
-
-                    ('cvss:ir', ('str', {'enums': 'X,L,M,H'}), {
-                        'deprecated': True,
-                        'doc': 'Deprecated. Please use :cvss:v3.'}),
-
-                    ('cvss:ar', ('str', {'enums': 'X,L,M,H'}), {
-                        'deprecated': True,
-                        'doc': 'Deprecated. Please use :cvss:v3.'}),
-
-                    ('cvss:score', ('float', {}), {
-                        'deprecated': True,
-                        'doc': 'Deprecated. Please use version specific score properties.'}),
-
-                    ('cvss:score:base', ('float', {}), {
-                        'deprecated': True,
-                        'doc': 'Deprecated. Please use version specific score properties.'}),
-
-                    ('cvss:score:temporal', ('float', {}), {
-                        'deprecated': True,
-                        'doc': 'Deprecated. Please use version specific score properties.'}),
-
-                    ('cvss:score:environmental', ('float', {}), {
-                        'deprecated': True,
-                        'doc': 'Deprecated. Please use version specific score properties.'}),
-
                     ('cwes', ('array', {'type': 'it:sec:cwe', 'uniq': True, 'sorted': True}), {
                         'doc': 'An array of MITRE CWE values that apply to the vulnerability.'}),
                 )),