Fix unquoted path in cleanup script
Land #3322, fix persistence cleanup script