Remove cyclic import