More cleaning
Testing upload
Fixed the upload issue