Remove cyclic call