Changes per David Fowler

* Refactored duplicate code into single function call
* Removed dead code
* Renamed showClipboardUpload -> showUploadPreview