MUMUP-1193 : cleanup