Removed legacy code
Removed unnecessary disk writes.  Now uploads from buffer.
Removed unnecessary writes to disk