Remove Q comparison code