Remove unused code
Add onDataUploaded()
Refactor