TEIID-2460 doing more and faster cleanup