cleanup up account fields for required and validation