Removed superfluous check for required fields which was causing validation to fail