diff --git a/config/local.testng.xml b/config/local.testng.xml
index fe47855..ce5abb5 100644
--- a/config/local.testng.xml
+++ b/config/local.testng.xml
@@ -3,7 +3,7 @@
 <suite name="Local">
     <test name="LocalTest">
         <parameter name="config" value="local.conf.json"/>
-        <parameter name="environment" value="galaxy_s6"/>
+        <parameter name="environment" value="galaxy_s7"/>
         <classes>
             <class name="com.browserstack.LocalTest"/>
         </classes>
diff --git a/config/parallel.testng.xml b/config/parallel.testng.xml
index 3137049..279c6c8 100644
--- a/config/parallel.testng.xml
+++ b/config/parallel.testng.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="Parallel" thread-count="4" parallel="tests">
-    <test name="SingleTestGalaxyS6">
-        <parameter name="config" value="parallel.conf.json"/>
-        <parameter name="environment" value="galaxy_s6"/>
-        <classes>
-            <class name="com.browserstack.SingleTest"/>
-        </classes>
-    </test>
-
+<suite name="Parallel" thread-count="3" parallel="tests">
     <test name="SingleTestPixel">
         <parameter name="config" value="parallel.conf.json"/>
         <parameter name="environment" value="pixel"/>
diff --git a/config/single.testng.xml b/config/single.testng.xml
index ecf41d0..005f61f 100644
--- a/config/single.testng.xml
+++ b/config/single.testng.xml
@@ -3,7 +3,7 @@
 <suite name="Single">
     <test name="SingleTest">
         <parameter name="config" value="single.conf.json"/>
-        <parameter name="environment" value="galaxy_s6"/>
+        <parameter name="environment" value="galaxy_s7"/>
         <classes>
             <class name="com.browserstack.SingleTest"/>
         </classes>
diff --git a/config/suite.testng.xml b/config/suite.testng.xml
index e3837c2..60167cf 100644
--- a/config/suite.testng.xml
+++ b/config/suite.testng.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
 <suite name="Pool" parallel="tests">
-    <test name="PoolTestS6" thread-count="3" parallel="classes">
+    <test name="PoolTestS7" thread-count="3" parallel="classes">
         <parameter name="config" value="suite.conf.json"/>
-        <parameter name="environment" value="galaxy_s6"/>
+        <parameter name="environment" value="galaxy_s7"/>
         <classes>
             <class name="com.browserstack.suite.SuiteTest01"/>
             <class name="com.browserstack.suite.SuiteTest02"/>
diff --git a/src/test/java/com/browserstack/BrowserStackTestNGTest.java b/src/test/java/com/browserstack/BrowserStackTestNGTest.java
index 327f22f..2103d5e 100644
--- a/src/test/java/com/browserstack/BrowserStackTestNGTest.java
+++ b/src/test/java/com/browserstack/BrowserStackTestNGTest.java
@@ -1,35 +1,22 @@
 package com.browserstack;
 import com.browserstack.local.Local;
 
-import java.io.File;
 import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStream;
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Iterator;
 import org.json.simple.JSONObject;
-import org.json.simple.JSONArray;
 import org.json.simple.parser.JSONParser;
 
-import io.appium.java_client.AppiumDriver;
-import io.appium.java_client.MobileElement;
 import io.appium.java_client.android.AndroidDriver;
 
 import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.remote.RemoteWebDriver;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.AfterMethod;
-import org.testng.annotations.Test;
 import org.testng.annotations.Parameters;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Factory;
-import org.testng.Assert;
 
 
 public class BrowserStackTestNGTest {
diff --git a/src/test/resources/conf/local.conf.json b/src/test/resources/conf/local.conf.json
index 2004a0f..b694d98 100644
--- a/src/test/resources/conf/local.conf.json
+++ b/src/test/resources/conf/local.conf.json
@@ -13,8 +13,8 @@
   },
 
   "environments": {
-    "galaxy_s6": {
-      "device": "Samsung Galaxy S6"
+    "galaxy_s7": {
+      "device": "Samsung Galaxy S7"
     }
   }
 }
diff --git a/src/test/resources/conf/parallel.conf.json b/src/test/resources/conf/parallel.conf.json
index 3bf699c..d1ef697 100644
--- a/src/test/resources/conf/parallel.conf.json
+++ b/src/test/resources/conf/parallel.conf.json
@@ -12,9 +12,6 @@
   },
 
   "environments": {
-    "galaxy_s6": {
-      "device": "Samsung Galaxy S6"
-    },
     "pixel": {
       "device": "Google Pixel"
     },
diff --git a/src/test/resources/conf/single.conf.json b/src/test/resources/conf/single.conf.json
index cccc831..484fa9b 100644
--- a/src/test/resources/conf/single.conf.json
+++ b/src/test/resources/conf/single.conf.json
@@ -12,8 +12,8 @@
   },
 
   "environments": {
-    "galaxy_s6": {
-      "device": "Samsung Galaxy S6"
+    "galaxy_s7": {
+      "device": "Samsung Galaxy S7"
     }
   }
 }
diff --git a/src/test/resources/conf/suite.conf.json b/src/test/resources/conf/suite.conf.json
index 84569bf..7cb1e7a 100644
--- a/src/test/resources/conf/suite.conf.json
+++ b/src/test/resources/conf/suite.conf.json
@@ -12,9 +12,6 @@
   },
 
   "environments": {
-    "galaxy_s6": {
-      "device": "Samsung Galaxy S6"
-    },
     "pixel": {
       "device": "Google Pixel"
     },