Remove cyclical dependency.