Remove upgrade method for translating to  QueryData