Did some clean up on the photo uploader