update delete handling and make action func names more explicit