Properly delete null values (configurable)