Clean up import routines