Removed $q dependency