Adding back analyzer deadlock workaround.
Removing command to delete empty sub folders inside organize.