More import cleanup