remove dependency of Q