Updated for new classes and cleand (a bit).

No match.