Remove to query dependecy