diff --git a/src/GUI/OptionsGroup.hpp b/src/GUI/OptionsGroup.hpp
index 56bc3dadf..4568226b1 100644
--- a/src/GUI/OptionsGroup.hpp
+++ b/src/GUI/OptionsGroup.hpp
@@ -32,7 +32,7 @@ public:
 
     /// Destructor to take care of the owned default value.
     ~Option() {
-        if (_default != nullptr) delete _default; 
+        delete _default; 
         _default = nullptr;
     }
 
diff --git a/xs/src/admesh/shared.c b/xs/src/admesh/shared.c
index 667aefc1e..092d64100 100644
--- a/xs/src/admesh/shared.c
+++ b/xs/src/admesh/shared.c
@@ -29,14 +29,11 @@ void
 stl_invalidate_shared_vertices(stl_file *stl) {
   if (stl->error) return;
 
-  if (stl->v_indices != NULL) {
-    free(stl->v_indices);
-    stl->v_indices = NULL;
-  }
-  if (stl->v_shared != NULL) {
-    free(stl->v_shared);
-    stl->v_shared = NULL;
-  }
+  free(stl->v_indices);
+  stl->v_indices = NULL;
+
+  free(stl->v_shared);
+  stl->v_shared = NULL;
 }
 
 void
diff --git a/xs/src/admesh/stlinit.c b/xs/src/admesh/stlinit.c
index 5db7c05d4..10f7cda2b 100644
--- a/xs/src/admesh/stlinit.c
+++ b/xs/src/admesh/stlinit.c
@@ -437,13 +437,9 @@ void
 stl_close(stl_file *stl) {
   if (stl->error) return;
 
-  if(stl->neighbors_start != NULL)
-    free(stl->neighbors_start);
-  if(stl->facet_start != NULL)
-    free(stl->facet_start);
-  if(stl->v_indices != NULL)
-    free(stl->v_indices);
-  if(stl->v_shared != NULL)
-    free(stl->v_shared);
+  free(stl->neighbors_start);
+  free(stl->facet_start);
+  free(stl->v_indices);
+  free(stl->v_shared);
 }
 
diff --git a/xs/src/libslic3r/ConfigBase.cpp b/xs/src/libslic3r/ConfigBase.cpp
index f65066b06..db2497af8 100644
--- a/xs/src/libslic3r/ConfigBase.cpp
+++ b/xs/src/libslic3r/ConfigBase.cpp
@@ -207,8 +207,7 @@ ConfigOptionDef::ConfigOptionDef(const ConfigOptionDef &other)
 
 ConfigOptionDef::~ConfigOptionDef()
 {
-    if (this->default_value != nullptr)
-        delete this->default_value;
+    delete this->default_value;
 }
 
 std::vector<std::string>
@@ -711,7 +710,7 @@ DynamicConfig::swap(DynamicConfig &other)
 DynamicConfig::~DynamicConfig () {
     for (t_options_map::iterator it = this->options.begin(); it != this->options.end(); ++it) {
         ConfigOption* opt = it->second;
-        if (opt != NULL) delete opt;
+        delete opt;
     }
 }
 
diff --git a/xs/src/libslic3r/GCode.cpp b/xs/src/libslic3r/GCode.cpp
index e5843880a..499a353fb 100644
--- a/xs/src/libslic3r/GCode.cpp
+++ b/xs/src/libslic3r/GCode.cpp
@@ -16,18 +16,15 @@ AvoidCrossingPerimeters::AvoidCrossingPerimeters()
 
 AvoidCrossingPerimeters::~AvoidCrossingPerimeters()
 {
-    if (this->_external_mp != NULL)
-        delete this->_external_mp;
+    delete this->_external_mp;
     
-    if (this->_layer_mp != NULL)
-        delete this->_layer_mp;
+    delete this->_layer_mp;
 }
 
 void
 AvoidCrossingPerimeters::init_external_mp(const ExPolygons &islands)
 {
-    if (this->_external_mp != NULL)
-        delete this->_external_mp;
+    delete this->_external_mp;
     
     this->_external_mp = new MotionPlanner(islands);
 }
@@ -35,8 +32,7 @@ AvoidCrossingPerimeters::init_external_mp(const ExPolygons &islands)
 void
 AvoidCrossingPerimeters::init_layer_mp(const ExPolygons &islands)
 {
-    if (this->_layer_mp != NULL)
-        delete this->_layer_mp;
+    delete this->_layer_mp;
     
     this->_layer_mp = new MotionPlanner(islands);
 }
diff --git a/xs/src/libslic3r/Model.cpp b/xs/src/libslic3r/Model.cpp
index a20864529..78590c6a4 100644
--- a/xs/src/libslic3r/Model.cpp
+++ b/xs/src/libslic3r/Model.cpp
@@ -145,9 +145,7 @@ Model::add_material(t_model_material_id material_id, const ModelMaterial &other)
 {
     // delete existing material if any
     ModelMaterial* material = this->get_material(material_id);
-    if (material != NULL) {
-        delete material;
-    }
+    delete material;
     
     // set new material
     material = new ModelMaterial(this, other);
diff --git a/xs/src/libslic3r/TriangleMesh.cpp b/xs/src/libslic3r/TriangleMesh.cpp
index f3ada5a65..692fce845 100644
--- a/xs/src/libslic3r/TriangleMesh.cpp
+++ b/xs/src/libslic3r/TriangleMesh.cpp
@@ -1650,7 +1650,7 @@ TriangleMeshSlicer<A>::TriangleMeshSlicer(TriangleMesh* _mesh) : mesh(_mesh), v_
 template <Axis A>
 TriangleMeshSlicer<A>::~TriangleMeshSlicer()
 {
-    if (this->v_scaled_shared != NULL) free(this->v_scaled_shared);
+    free(this->v_scaled_shared);
 }
 
 template class TriangleMeshSlicer<X>;
diff --git a/xs/src/xsinit.h b/xs/src/xsinit.h
index 688f821ce..cd67bb509 100644
--- a/xs/src/xsinit.h
+++ b/xs/src/xsinit.h
@@ -162,10 +162,8 @@ class Filler
     public:
     Filler() : fill(NULL) {};
     ~Filler() { 
-        if (fill != NULL) {
-            delete fill; 
-            fill = NULL;
-        }
+        delete fill; 
+        fill = NULL;
     };
     Fill* fill;
 };