some import cleanup