Select completed units cleanup