Revert "Added Query, Resource Labels"

This reverts commit 2d1d72aac35761bff4ee64d6c4d4dfa5aad0bcef.