ISPN-3017 Fix cleaning up the filesystem based index