Removed validationof empty fields