Clean Up and Sync with lotus tree