Clean up the import code - especially for Simulink
Clean up the import code - especially for Simulink