more import cleanup