Remove $q injection