[z2617] Drop some non-classic content