Some import cleanup