major import cleanup