Remove deprecated code, add uniq egenrating name for uploading pictires