PIM-2272: Fix mass edit
PIM-2272: Remove useless use statements