removed some out dated stuff. readded delete-this-buffer-and-file.