abstract descriptors cleanup