They'll never remove the classes, for all kinds of reasons.

The cities, for example, would lose a large amount of relevance if they simply existed as three separate market boards and nothing else.