Fixed messed up streams causing non-deletable files.
Removed a bunch of junk caused by the above.