cleaning up types and descriptors