Issue #379 - Replace Java-Uploader
some code cleanup