Use clear methods instead of setting null values

Use clear methods instead of setting null values #2166