Activityresults: more cleanup and "delete" feature