   (interactive "P")
   (let* ((no-ansi-file (buffer-file-name))
          (orig-file (replace-regexp-in-string
-                     "!" "/"
-                     (replace-regexp-in-string
-                      de-ansify-no-ansi-file-path-prefix "" no-ansi-file)))
+                     "!" "/" (file-name-nondirectory no-ansi-file)))
          (elt (assoc orig-file de-ansify--file-notify-alist))
          (descriptor (cdr elt)))
-    (when (not no-delete)
-      (when (yes-or-no-p "[de-ansify] Are you sure you want to delete this file? ")
-        (delete-file no-ansi-file)
-        (kill-buffer (current-buffer))))
     ;; Remove the `elt' from the filenotify watch list and
     ;; `de-ansify--file-notify-alist'
     (file-notify-rm-watch descriptor)
     (setq de-ansify--file-notify-alist (delete elt de-ansify--file-notify-alist))
+    (when (not no-delete)
+      (when (yes-or-no-p "[de-ansify] Are you sure you want to delete this file? ")
+        (delete-file no-ansi-file)
+        (kill-buffer (current-buffer))
+        (message "Deleted `%s'" no-ansi-file)))
     (find-file orig-file)))
 
 (defun de-ansify-flush-watch-list ()

watch for it."
  (interactive)
  (let* ((orig-file (buffer-file-name))
         (no-ansi-file (concat de-ansify-no-ansi-file-path-prefix
                               (replace-regexp-in-string "/" "!" orig-file)))
         descriptor)
    ;; Add a watch for this file IF one is not already added

      (add-to-list 'de-ansify--file-notify-alist (cons orig-file descriptor)))
    (de-ansify--copy-and-de-ansify orig-file no-ansi-file)
    (find-file no-ansi-file)
    (with-current-buffer (get-file-buffer no-ansi-file)
      (setq-local kill-buffer-query-functions
                  (remq 'server-kill-buffer-query-function
                        kill-buffer-query-functions))
      (de-ansify-mode 1) ; Set the `de-ansify-mode-map' bindings
      (auto-revert-mode 1))))

(defun de-ansify-notify-callback (event)
  "On getting triggered, copy the original file to a separate file and de-ansify
that file asynchronously using `de-ansify-async' function."
  ;; EVENT is of the form (DESCRIPTOR ACTION FILE [FILE1])
  (let* ((orig-file (nth 2 event))
         (no-ansi-file (concat de-ansify-no-ansi-file-directory
                               (replace-regexp-in-string "/" "!" orig-file))))
    ;; (message "Event: %S" event)
    (de-ansify--copy-and-de-ansify orig-file no-ansi-file)
    (message "De-ansified file updated with changes in `%s'" orig-file)))

(defun de-ansify-remove-watch (no-delete)
  "Remove the current file from the filenotify watch list and also delete the
