Improve DBCleaner

Improve DBCleaner