more cleanup for FSCache-removal