cleanup dirtree and move-text