Removing unused data types