diff --git a/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp b/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp
index d185487bb2642fb1628e1a9dc0a932c0ea1e71a0..90ffbab9b4c3b195a19c564dcd9e940494985e9a 100644
--- a/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp
+++ b/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp
@@ -1,4 +1,8 @@
 #include "Simulation.h"
+
+#include <stdio.h>
+#include <vector>
+
 #include "LBM/LB.h"
 #include "Communication/Communicator.h"
 #include "Communication/ExchangeData27.h"
@@ -40,17 +44,6 @@
 #include "Calculation/ForceCalculations.h"
 #include "Calculation/PorousMedia.h"
 //////////////////////////////////////////////////////////////////////////
-//CUDA
-#include <cuda_runtime.h>
-#include <helper_functions.h>
-#include <helper_cuda.h>
-////random numbers
-//#include <curand.h>
-//#include <curand_kernel.h>
-//////////////////////////////////////////////////////////////////////////
-#include <boost/foreach.hpp>
-#include <stdio.h>
-#include <vector>
 #include "Restart/RestartPostprocessor.h"
 //////////////////////////////////////////////////////////////////////////
 #include "DataStructureInitializer/GridProvider.h"
@@ -59,17 +52,6 @@
 #include "PreProcessor/PreProcessorFactory/PreProcessorFactory.h"
 #include "Kernel/Kernel.h"
 
-Simulation::Simulation()
-{
-
-}
-
-Simulation::~Simulation()
-{
-
-}
-
-
 void Simulation::setFactories(std::shared_ptr<KernelFactory> kernelFactory, std::shared_ptr<PreProcessorFactory> preProcessorFactory)
 {
 	this->kernelFactory = kernelFactory;
diff --git a/src/gpu/VirtualFluids_GPU/LBM/Simulation.h b/src/gpu/VirtualFluids_GPU/LBM/Simulation.h
index afecb7afd5b0ec241de1b408612fe734db3a560c..b0069b6788843e289a6f3a535ed7d3872ac249ca 100644
--- a/src/gpu/VirtualFluids_GPU/LBM/Simulation.h
+++ b/src/gpu/VirtualFluids_GPU/LBM/Simulation.h
@@ -5,13 +5,12 @@
 #include <vector>
 #include <PointerDefinitions.h>
 
-
-
 #include "Output/LogWriter.hpp"
 #include "GPU/KineticEnergyAnalyzer.h"
 #include "GPU/EnstrophyAnalyzer.h"
 #include "Utilities/Buffer2D.hpp"
 #include "LBM/LB.h"
+
 #include "VirtualFluids_GPU_export.h"
 
 class Communicator;
@@ -33,8 +32,6 @@ class TrafficMovementFactory;
 class VIRTUALFLUIDS_GPU_EXPORT Simulation
 {
 public:
-	Simulation();
-	~Simulation();
 	void run();
 	void init(SPtr<Parameter> para, SPtr<GridProvider> gridProvider, std::shared_ptr<DataWriter> dataWriter, std::shared_ptr<CudaMemoryManager> cudaManager);
 	void free();