Clean-up from pulling in data types (compiling).