remove hardcoded soql and sosl stuff