Removed non required fields in validation