PIM-2312: Clean Export controllers