diff --git a/samples/extension/src/com/amd/aparapi/sample/extension/MandelExample.java b/samples/extension/src/com/amd/aparapi/sample/extension/MandelExample.java
index 49540b42bff6236ba5232761527e06f640f29699..b1274ab239950c84049e6498a005085e5c6f37c8 100644
--- a/samples/extension/src/com/amd/aparapi/sample/extension/MandelExample.java
+++ b/samples/extension/src/com/amd/aparapi/sample/extension/MandelExample.java
@@ -418,29 +418,7 @@ public class MandelExample{
       float offsetx = .0f;
 
       float offsety = .0f;
-      //Device device = Device.firstGPU();
-      Device device = null;
-      /*
-      device = OpenCLDevice.select(new OpenCLDevice.DeviceSelector(){
-         @Override public OpenCLDevice select(OpenCLDevice device) {
-            return((device.getType()==Device.TYPE.GPU 
-                 // && device.getPlatform().getVendor().equals("NVIDIA Corporation")
-                  && device.getPlatform().getVendor().equals("Advanced Micro Devices, Inc.")
-                  )?device:null);
-         }});
-      */
-      for (OpenCLPlatform p : OpenCLPlatform.getPlatforms()) {
-         // if (p.getVendor().equals("NVIDIA Corporation")){
-         if (p.getVendor().equals("Advanced Micro Devices, Inc.")) {
-            for (OpenCLDevice d : p.getDevices()) {
-               if (d.getType().equals(Device.TYPE.GPU)) {
-                  device = d;
-                  break;
-               }
-            }
-         }
-      }
-
+      Device device = Device.firstGPU();
       if (device instanceof OpenCLDevice) {
          OpenCLDevice openclDevice = (OpenCLDevice) device;