[OEM-109] tidied up delete form