Removed unused type definitions and wrappers.