Clean up data type declarations