trying a full system rm -rf to clean up paths instead of cleaning the contents and then calling fs.rmdir
Useless change
Revert "Useless change"

This reverts commit 6dee38ae6e4e6eb1fcfb83bfe775ca23e7ff747b.
Revert "Revert "Useless change""

This reverts commit 0d93f45caa6f7762559095ceb52f020335e9bb06.