cleaned up rmdir a bit