adding cleanup and upload components