With tha latest changes we can safely remove `$q` from the dependencies