diff --git a/src/main/java/neqsim/process/equipment/separator/TwoPhaseSeparator.java b/src/main/java/neqsim/process/equipment/separator/TwoPhaseSeparator.java
index 58dae0ee1..d7b3858ef 100644
--- a/src/main/java/neqsim/process/equipment/separator/TwoPhaseSeparator.java
+++ b/src/main/java/neqsim/process/equipment/separator/TwoPhaseSeparator.java
@@ -18,17 +18,6 @@ public class TwoPhaseSeparator extends Separator {
   /** Serialization version UID. */
   private static final long serialVersionUID = 1000;
 
-  SystemInterface thermoSystem;
-
-  SystemInterface gasSystem;
-  SystemInterface waterSystem;
-  SystemInterface liquidSystem;
-  SystemInterface thermoSystemCloned;
-
-  StreamInterface inletStream;
-  StreamInterface gasOutStream;
-  StreamInterface liquidOutStream;
-
   /**
    * Constructor for TwoPhaseSeparator.
    *
@@ -43,68 +32,12 @@ public TwoPhaseSeparator(String name) {
    * Constructor for TwoPhaseSeparator.
    * </p>
    *
-   * @param name a {@link java.lang.String} object
-   * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} object
+   * @param name        a {@link java.lang.String} object
+   * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface}
+   *                    object
    */
   public TwoPhaseSeparator(String name, StreamInterface inletStream) {
     super(name, inletStream);
   }
 
-  /** {@inheritDoc} */
-  @Override
-  public void setInletStream(StreamInterface inletStream) {
-    this.inletStream = inletStream;
-
-    thermoSystem = inletStream.getThermoSystem().clone();
-    gasSystem = thermoSystem.phaseToSystem(thermoSystem.getPhases()[0]);
-    gasOutStream = new Stream("gasOutStream", gasSystem);
-
-    thermoSystem = inletStream.getThermoSystem().clone();
-    liquidSystem = thermoSystem.phaseToSystem(thermoSystem.getPhases()[1]);
-    liquidOutStream = new Stream("liquidOutStream", liquidSystem);
-  }
-
-  /** {@inheritDoc} */
-  @Override
-  public StreamInterface getLiquidOutStream() {
-    return liquidOutStream;
-  }
-
-  /** {@inheritDoc} */
-  @Override
-  public StreamInterface getGasOutStream() {
-    return gasOutStream;
-  }
-
-  /** {@inheritDoc} */
-  @Override
-  public StreamInterface getGas() {
-    return getGasOutStream();
-  }
-
-  /** {@inheritDoc} */
-  @Override
-  public StreamInterface getLiquid() {
-    return getLiquidOutStream();
-  }
-
-  /** {@inheritDoc} */
-  @Override
-  public void run(UUID id) {
-    thermoSystem = inletStream.getThermoSystem().clone();
-    gasSystem = thermoSystem.phaseToSystem(thermoSystem.getPhases()[0]);
-    gasSystem.setNumberOfPhases(1);
-    gasOutStream.setThermoSystem(gasSystem);
-
-    thermoSystem = inletStream.getThermoSystem().clone();
-    liquidSystem = thermoSystem.phaseToSystem(thermoSystem.getPhases()[1]);
-    liquidSystem.setNumberOfPhases(1);
-    liquidOutStream.setThermoSystem(liquidSystem);
-    setCalculationIdentifier(id);
-  }
-
-  /** {@inheritDoc} */
-  @Override
-  @ExcludeFromJacocoGeneratedReport
-  public void displayResult() {}
 }