One more optimization to maintenance thread