[WIP] qdel improvement