Fixed Tiab clean up  problems