removed spurious references to Descriptor class and descriptor.h