Revert to sync usage of rimraf