Remove explicit q dependency