PIM-2290: Clean mass actions