Couldn't delete directories, had to split delete from unlink to allow.  Cleaned up a couple of filename length overrruns