Keep known codes in a single list now that they're both derived from the same class
Remove unused classes