PIM-3061 : remove class