removed extra data queries