PIM-3367 : clean currency controller