simplify code and fix advice ... in 24

fixes #45 - not sure if it works in emacs 23 since the signature changed on delete-file (&optional trash)