more cleaning up for validator