More cyclic import cleanup