Additional cleanup and fixes

Added longer timeout for publishing
Removed unused options
Sped up Upload messages
Fix for uploading files with no custom fields