Should this not clean anything up?  Most usages of this will have a caller also trying to clean up the directories, but it seems like it might be useful for this to also attempt to cleanup?