updating delete logic around messaging and applying checks for empty directory after filter