diff --git a/GeoLib/SensorData.h b/GeoLib/SensorData.h
index 72e116cdd10c14394ca83ca1f2120ac91be12410..bcd5010306c9e9d701805ca355b08ac7df9c1175 100644
--- a/GeoLib/SensorData.h
+++ b/GeoLib/SensorData.h
@@ -91,25 +91,25 @@ public:
 	const std::vector<float>* getTimeSeries(SensorDataType::type time_series_name) const;
 
 	/// Returns all time series names contained in this container
-	const std::vector<SensorDataType::type>& getTimeSeriesNames() const { return _vec_names; };
+	const std::vector<SensorDataType::type>& getTimeSeriesNames() const { return _vec_names; }
 
 	/// Returns the time step vector (if it exists)
-	const std::vector<std::size_t>& getTimeSteps() const { return _time_steps; };
+	const std::vector<std::size_t>& getTimeSteps() const { return _time_steps; }
 
 	/// Returns the first time step
-	std::size_t getStartTime() const { return _start; };
+	std::size_t getStartTime() const { return _start; }
 
 	/// Returns the last time step
-	std::size_t getEndTime() const { return _end; };
+	std::size_t getEndTime() const { return _end; }
 
 	/// Returns the interval between time steps (Returns "0" if a vector is given!)
-	std::size_t getStepSize() const { return _step_size; };
+	std::size_t getStepSize() const { return _step_size; }
 
 	/// Allows to set a unit for the time steps
-	void setTimeUnit(TimeStepType::type t) { _time_unit = t; };
+	void setTimeUnit(TimeStepType::type t) { _time_unit = t; }
 
 	/// Returns the unit the time steps
-	TimeStepType::type getTimeUnit() const { return _time_unit; };
+	TimeStepType::type getTimeUnit() const { return _time_unit; }
 
 	/// Returns the data unit of the given time series
 	std::string getDataUnit(SensorDataType::type t) const;
diff --git a/GeoLib/Station.h b/GeoLib/Station.h
index 513100ec075344bcd0f681531b10e94b9910cb62..e4d66b08cb4d7cdae71177945857cc66d5c1f967 100644
--- a/GeoLib/Station.h
+++ b/GeoLib/Station.h
@@ -144,16 +144,16 @@ public:
 	static Station* createStation(const std::string &name, double x, double y, double z);
 
 	/// Returns the specific value for this station
-	double getStationValue() { return this->_station_value; };
+	double getStationValue() { return this->_station_value; }
 
 	/// Allows to set a specific value for this station (e.g. for classification)
-	void setStationValue(double station_value) { this->_station_value = station_value; };
+	void setStationValue(double station_value) { this->_station_value = station_value; }
 
 	/// Allows to add sensor data from a CSV file to the observation site
-	void addSensorDataFromCSV(const std::string &file_name) { this->_sensor_data = new SensorData(file_name); };
+	void addSensorDataFromCSV(const std::string &file_name) { this->_sensor_data = new SensorData(file_name); }
 
 	/// Returns all the sensor data for this observation site
-	const SensorData* getSensorData() { return this->_sensor_data; };
+	const SensorData* getSensorData() { return this->_sensor_data; }
 
 protected:
 	/**
diff --git a/GeoLib/Surface.h b/GeoLib/Surface.h
index abd3ae012f1939d7e95d6843952742f5e4f3522b..8a9deabdd5bdce3c4280c0633f734d10df11df5e 100644
--- a/GeoLib/Surface.h
+++ b/GeoLib/Surface.h
@@ -67,7 +67,7 @@ public:
 	 */
 	bool isPntInSfc (const double *pnt) const;
 
-	const std::vector<Point*> *getPointVec() const { return &_sfc_pnts; };
+	const std::vector<Point*> *getPointVec() const { return &_sfc_pnts; }
 
 	/**
 	 * method allows access to the internal axis aligned bounding box
diff --git a/MathLib/LinAlg/Dense/DenseMatrix.h b/MathLib/LinAlg/Dense/DenseMatrix.h
index 8f21abf4a7183c13e79f4745a68ca64385349931..90ebf1a06d551df60acade035cc79ff3220fce4e 100644
--- a/MathLib/LinAlg/Dense/DenseMatrix.h
+++ b/MathLib/LinAlg/Dense/DenseMatrix.h
@@ -136,9 +136,9 @@ protected:
 	IDX_TYPE _n_cols;
 
    // zero based addressing, but Fortran storage layout
-   //inline IDX_TYPE address(IDX_TYPE i, IDX_TYPE j) const { return j*rows+i; };
+   //inline IDX_TYPE address(IDX_TYPE i, IDX_TYPE j) const { return j*rows+i; }
    // zero based addressing, C storage layout
-   inline IDX_TYPE address(IDX_TYPE i, IDX_TYPE j) const { return i*_n_cols+j; };
+   inline IDX_TYPE address(IDX_TYPE i, IDX_TYPE j) const { return i*_n_cols+j; }
 
    FP_TYPE *_data;
 };
diff --git a/MathLib/LinAlg/Dense/DenseVector.h b/MathLib/LinAlg/Dense/DenseVector.h
index 1d297b2bc5e6c45b9a02169cbbbaf88c549cea6d..309930dfd3b16047e9f8ebdcbf92482e83b109b4 100644
--- a/MathLib/LinAlg/Dense/DenseVector.h
+++ b/MathLib/LinAlg/Dense/DenseVector.h
@@ -51,13 +51,13 @@ public:
 	std::size_t getRangeEnd() const { return this->size(); }
 
 	/// get entry
-	double get(std::size_t i) const { return (*this)[i]; };
+	double get(std::size_t i) const { return (*this)[i]; }
 
 	/// set a value to entry
-	void set(std::size_t i, double v) { (*this)[i] = v; };
+	void set(std::size_t i, double v) { (*this)[i] = v; }
 
 	/// add a value to entry
-	void add(std::size_t i, double v) { (*this)[i] += v; };
+	void add(std::size_t i, double v) { (*this)[i] += v; }
 
 	/**
 	 * add a sub vector
diff --git a/MathLib/LinAlg/Sparse/SparseMatrixBase.h b/MathLib/LinAlg/Sparse/SparseMatrixBase.h
index 8a96fcb15b886116bc59c2cafe70bae720da645f..5ac0ded8974099f1fcbb25ddc3f17f963d2d92a7 100644
--- a/MathLib/LinAlg/Sparse/SparseMatrixBase.h
+++ b/MathLib/LinAlg/Sparse/SparseMatrixBase.h
@@ -19,7 +19,7 @@ public:
 	 * @param y result vector
 	 */
 	virtual void amux(FP_TYPE d, FP_TYPE const * const __restrict__ x, FP_TYPE * __restrict__ y) const = 0;
-	virtual ~SparseMatrixBase() {};
+	virtual ~SparseMatrixBase() {}
 	/**
 	 * get the number of rows
 	 * @return the number of rows