diff --git a/Sample/StandardSamples/ExemplarySamples.h b/Sample/StandardSamples/ExemplarySamples.h
index acde307a64a2eb63c92c99c7f68f414ba256590e..27abfdb784202b4b5bf4bcd68cf2c25df7da552a 100644
--- a/Sample/StandardSamples/ExemplarySamples.h
+++ b/Sample/StandardSamples/ExemplarySamples.h
@@ -48,6 +48,5 @@ class MultiLayer;
 #include "Sample/StandardSamples/ThickAbsorptiveSampleBuilder.h"
 #include "Sample/StandardSamples/TransformationsBuilder.h"
 #include "Sample/StandardSamples/TwoDimLatticeBuilder.h"
-#include "Sample/StandardSamples/TwoLayerRoughnessBuilder.h"
 
 #endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_EXEMPLARYSAMPLES_H
diff --git a/Sample/StandardSamples/TwoLayerRoughnessBuilder.cpp b/Sample/StandardSamples/TwoLayerRoughnessBuilder.cpp
deleted file mode 100644
index 72be856b5a2c3a07ea804b8d0a827f5643922b8c..0000000000000000000000000000000000000000
--- a/Sample/StandardSamples/TwoLayerRoughnessBuilder.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-//  ************************************************************************************************
-//
-//  BornAgain: simulate and fit reflection and scattering
-//
-//! @file      Sample/StandardSamples/TwoLayerRoughnessBuilder.cpp
-//! @brief     Implement class TwoLayerRoughnessBuilder.
-//!
-//! @homepage  http://www.bornagainproject.org
-//! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2018
-//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
-//
-//  ************************************************************************************************
-
-#include "Sample/StandardSamples/TwoLayerRoughnessBuilder.h"
-#include "Sample/Interface/LayerRoughness.h"
-#include "Sample/Multilayer/Layer.h"
-#include "Sample/Multilayer/MultiLayer.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
-
-MultiLayer* ExemplarySamples::createTwoLayerRoughness()
-{
-    const double m_sigma(1.0);
-    const double m_hurst(0.3);
-    const double m_lateralCorrLength(5.0);
-
-    Layer vacuum_layer(refMat::Vacuum, 0);
-    Layer substrate_layer(refMat::Substrate, 0);
-
-    LayerRoughness roughness(m_sigma, m_hurst, m_lateralCorrLength);
-
-    MultiLayer* sample = new MultiLayer();
-    sample->addLayer(vacuum_layer);
-    sample->addLayerWithTopRoughness(substrate_layer, roughness);
-    return sample;
-}
diff --git a/Sample/StandardSamples/TwoLayerRoughnessBuilder.h b/Sample/StandardSamples/TwoLayerRoughnessBuilder.h
deleted file mode 100644
index 384a539a90aa99a0ca26d902e461264f097ae17f..0000000000000000000000000000000000000000
--- a/Sample/StandardSamples/TwoLayerRoughnessBuilder.h
+++ /dev/null
@@ -1,34 +0,0 @@
-//  ************************************************************************************************
-//
-//  BornAgain: simulate and fit reflection and scattering
-//
-//! @file      Sample/StandardSamples/TwoLayerRoughnessBuilder.h
-//! @brief     Defines class TwoLayerRoughnessBuilder.
-//!
-//! @homepage  http://www.bornagainproject.org
-//! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2018
-//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
-//
-//  ************************************************************************************************
-
-#ifdef SWIG
-#error no need to expose this header to Swig
-#endif
-
-#ifndef USER_API
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_TWOLAYERROUGHNESSBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_TWOLAYERROUGHNESSBUILDER_H
-
-class MultiLayer;
-
-
-//! Builds sample: two layers with rough interface.
-//! @ingroup standard_samples
-
-namespace ExemplarySamples {
-MultiLayer* createTwoLayerRoughness();
-} // namespace ExemplarySamples
-
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_TWOLAYERROUGHNESSBUILDER_H
-#endif // USER_API
diff --git a/auto/Wrap/doxygenSample.i b/auto/Wrap/doxygenSample.i
index 57a07e51a8ef15d57d124e4b848895643955c67a..170c09497fcd1641444bf7104ce5943da50946db 100644
--- a/auto/Wrap/doxygenSample.i
+++ b/auto/Wrap/doxygenSample.i
@@ -5930,9 +5930,6 @@ Returns a body-centered cubic (cI) lattice with edge length a. TODO: Clarify mea
 %feature("docstring")  ExemplarySamples::createSuperLattice "MultiLayer * ExemplarySamples::createSuperLattice()
 ";
 
-%feature("docstring")  ExemplarySamples::createTwoLayerRoughness "MultiLayer * ExemplarySamples::createTwoLayerRoughness()
-";
-
 
 // File: namespaceMaterialUtils.xml
 %feature("docstring")  MaterialUtils::ScalarReducedPotential "complex_t MaterialUtils::ScalarReducedPotential(complex_t n, R3 k, double n_ref)
@@ -6976,12 +6973,6 @@ Generate vertices of centered ellipse with given semi-axes at height z.
 // File: TwoDimLatticeBuilder_8h.xml
 
 
-// File: TwoLayerRoughnessBuilder_8cpp.xml
-
-
-// File: TwoLayerRoughnessBuilder_8h.xml
-
-
 // File: dir_220e7f16e10b4e45e27e10ed0346ff0c.xml