Clean up usings and updated implementation for Field.IsValid