bundling cleanup queries together