cleaner optimization
add sync for storage clean and improve the unittest