More cleanup in activityresults