7369: remove dummy classes