Refactor
Remove comments
Use the new uploader forms
Patch uploader