Major import cleanup