Massive directory cleanup, more reliable transport