diff --git a/linux/gpio/LinuxLibgpioIF.cpp b/linux/gpio/LinuxLibgpioIF.cpp
index daaff8ba..1b152a0f 100644
--- a/linux/gpio/LinuxLibgpioIF.cpp
+++ b/linux/gpio/LinuxLibgpioIF.cpp
@@ -39,7 +39,6 @@ ReturnValue_t LinuxLibgpioIF::initialize(GpioCookie* gpioCookie){
 }
 
 ReturnValue_t LinuxLibgpioIF::configureGpios(GpioMap& mapToAdd) {
-    //GpioMapIter mapToAddIter;
     std::string chipname;
     unsigned int lineNum;
     struct gpiod_chip *chip;
@@ -48,9 +47,7 @@ ReturnValue_t LinuxLibgpioIF::configureGpios(GpioMap& mapToAdd) {
     struct gpiod_line *lineHandle;
     int result;
 
-    //mapToAddIter = mapToAdd->begin();
     for(auto& gpioConfig: mapToAdd) {
-    //for (; mapToAddIter != mapToAdd->end(); mapToAddIter++) {
         chipname = gpioConfig.second.chipname;
         chip = gpiod_chip_open_by_name(chipname.c_str());
         if (!chip) {
@@ -119,7 +116,7 @@ ReturnValue_t LinuxLibgpioIF::driveGpio(gpioId_t gpioId,
     int result;
     struct gpiod_line *lineHandle;
 
-    auto gpioMapIter = gpioMap.find(gpioId);
+    gpioMapIter = gpioMap.find(gpioId);
     if (gpioMapIter == gpioMap.end()){
         sif::debug << "LinuxLibgpioIF::driveGpio: Unknown gpio id " << gpioId << std::endl;
         return RETURN_FAILED;
@@ -139,7 +136,7 @@ ReturnValue_t LinuxLibgpioIF::driveGpio(gpioId_t gpioId,
 ReturnValue_t LinuxLibgpioIF::readGpio(gpioId_t gpioId, int* gpioState) {
     struct gpiod_line *lineHandle;
 
-    auto gpioMapIter = gpioMap.find(gpioId);
+    gpioMapIter = gpioMap.find(gpioId);
     if (gpioMapIter == gpioMap.end()){
         sif::debug << "LinuxLibgpioIF::readGpio: Unknown gpio id " << gpioId << std::endl;
         return RETURN_FAILED;
@@ -153,7 +150,6 @@ ReturnValue_t LinuxLibgpioIF::readGpio(gpioId_t gpioId, int* gpioState) {
 
 ReturnValue_t LinuxLibgpioIF::checkForConflicts(GpioMap& mapToAdd){
     gpioId_t gpioId;
-    auto gpioMapIter = gpioMap.begin();
     for(auto& gpioConfig: mapToAdd) {
         gpioId = gpioConfig.first;
         /* Cross check with private map */
diff --git a/linux/gpio/LinuxLibgpioIF.h b/linux/gpio/LinuxLibgpioIF.h
index f8a5e176..6a412733 100644
--- a/linux/gpio/LinuxLibgpioIF.h
+++ b/linux/gpio/LinuxLibgpioIF.h
@@ -32,6 +32,7 @@ public:
 private:
 	/* Holds the information and configuration of all used GPIOs */
 	GpioMap gpioMap;
+	GpioMapIter gpioMapIter;
 
 	/**
 	 * @brief	This functions drives line of a GPIO specified by the GPIO ID.