Cleanup and remove unneeded code.
Implemented upload status icon in Uploader.