PIM-2248 : remove deprecated form types