Merge "Bulk process shortcut removals"