Clean-up from pulling in data types.
Clean-up from pulling in data types.