More user file deletion

Sheesh I thought that this stuff was already gone.
Further NSURL fixes

Added more error checking.
XCode recommended re-factoring

Enclosures and other cool code shortcuts.