[OEM-109] cleaned up form