I prefer not. I like the syste as it. THe classes should be removed when ARR launched, now is too late. Just keep them.