cleanup type definitions