diff --git a/lib/controller/checks.py b/lib/controller/checks.py
index c77f85220..ef0a51a05 100644
--- a/lib/controller/checks.py
+++ b/lib/controller/checks.py
@@ -66,12 +66,7 @@ def unescape(string, dbms):
                   "Sybase": Sybase.unescape
                 }
 
-    if isinstance(dbms, list):
-        dbmsunescaper = unescaper[dbms[0]]
-    else:
-        dbmsunescaper = unescaper[dbms]
-
-    return dbmsunescaper(string)
+    return unescaper[dbms](string)
 
 def checkSqlInjection(place, parameter, value):
     # Store here the details about boundaries and payload used to
diff --git a/lib/controller/controller.py b/lib/controller/controller.py
index 5e709c72d..045d9daf6 100644
--- a/lib/controller/controller.py
+++ b/lib/controller/controller.py
@@ -121,7 +121,7 @@ def __selectInjection():
             raise sqlmapUserQuitException
         else:
             errMsg = "invalid choice"
-            raise sqlmapValueException, errMsg            
+            raise sqlmapValueException, errMsg
 
         kb.injection = kb.injections[index]
 
diff --git a/xml/payloads.xml b/xml/payloads.xml
index 2d0715ba7..7f5da2a03 100644
--- a/xml/payloads.xml
+++ b/xml/payloads.xml
@@ -482,7 +482,6 @@ Formats:
         </response>
         <details>
             <dbms>Microsoft SQL Server</dbms>
-            <dbms>Sybase</dbms>
         </details>
     </test>
 
@@ -574,7 +573,6 @@ Formats:
         </response>
         <details>
             <dbms>Microsoft SQL Server</dbms>
-            <dbms>Sybase</dbms>
         </details>
     </test>
 
@@ -668,7 +666,6 @@ Formats:
         </response>
         <details>
             <dbms>Microsoft SQL Server</dbms>
-            <dbms>Sybase</dbms>
         </details>
     </test>
 
@@ -749,7 +746,6 @@ Formats:
         </response>
         <details>
             <dbms>Microsoft SQL Server</dbms>
-            <dbms>Sybase</dbms>
         </details>
     </test>
 
@@ -823,7 +819,6 @@ Formats:
         </response>
         <details>
             <dbms>Microsoft SQL Server</dbms>
-            <dbms>Sybase</dbms>
         </details>
     </test>
 
@@ -974,7 +969,6 @@ Formats:
         </response>
         <details>
             <dbms>Microsoft SQL Server</dbms>
-            <dbms>Sybase</dbms>
         </details>
     </test>