Remove the Q mapping, it's useless.