Cleanup of data types