remove data preparation queries and update table names