Removed some unused type definitions and aliases