Clean up type id / type data type.