diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py
index 6cfe915036..4f3574559e 100644
--- a/src/calibre/customize/builtins.py
+++ b/src/calibre/customize/builtins.py
@@ -573,8 +573,8 @@ from calibre.devices.edge.driver import EDGE
 from calibre.devices.teclast.driver import TECLAST_K3, NEWSMY, IPAPYRUS, \
         SOVOS, PICO, SUNSTECH_EB700, ARCHOS7O, STASH
 from calibre.devices.sne.driver import SNE
-from calibre.devices.misc import PALMPRE, AVANT, SWEEX, PDNOVEL, KOGAN, \
-        GEMEI, VELOCITYMICRO, PDNOVEL_KOBO, Q600, LUMIREAD, ALURATEK_COLOR, \
+from calibre.devices.misc import PALMPRE, AVANT, SWEEX, PDNOVEL, \
+        GEMEI, VELOCITYMICRO, PDNOVEL_KOBO, LUMIREAD, ALURATEK_COLOR, \
         TREKSTOR, EEEREADER, NEXTBOOK
 from calibre.devices.folder_device.driver import FOLDER_DEVICE_FOR_CONFIG
 from calibre.devices.kobo.driver import KOBO
@@ -691,8 +691,6 @@ plugins += [
     AVANT,
     MENTOR,
     SWEEX,
-    Q600,
-    KOGAN,
     PDNOVEL,
     SPECTRA,
     GEMEI,
diff --git a/src/calibre/devices/misc.py b/src/calibre/devices/misc.py
index e549a4a9fd..d74f727a0e 100644
--- a/src/calibre/devices/misc.py
+++ b/src/calibre/devices/misc.py
@@ -54,41 +54,24 @@ class AVANT(USBMS):
 class SWEEX(USBMS):
     # Identical to the Promedia
     name           = 'Sweex Device Interface'
-    gui_name       = 'Sweex'
-    description    = _('Communicate with the Sweex MM300')
+    gui_name       = 'Sweex/Kogan/Q600/Wink'
+    description    = _('Communicate with the Sweex/Kogan/Q600/Wink')
     author         = 'Kovid Goyal'
     supported_platforms = ['windows', 'osx', 'linux']
 
     # Ordered list of supported formats
-    FORMATS     = ['epub', 'prc', 'fb2', 'html', 'rtf', 'chm', 'pdf', 'txt']
+    FORMATS     = ['epub', 'mobi', 'prc', 'fb2', 'html', 'rtf', 'chm', 'pdf', 'txt']
 
     VENDOR_ID   = [0x0525, 0x177f]
     PRODUCT_ID  = [0xa4a5, 0x300]
-    BCD         = [0x0319, 0x110]
+    BCD         = [0x0319, 0x110, 0x325]
 
-    VENDOR_NAME = 'SWEEX'
-    WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = 'EBOOKREADER'
+    VENDOR_NAME = ['SWEEX', 'LINUX']
+    WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = ['EBOOKREADER', 'FILE-STOR_GADGET']
 
     EBOOK_DIR_MAIN = ''
     SUPPORTS_SUB_DIRS = True
 
-class Q600(SWEEX):
-
-    name = 'Digma Q600 Device interface'
-    gui_name = 'Q600'
-    description    = _('Communicate with the Digma Q600')
-
-    BCD = [0x325]
-    FORMATS     = ['epub', 'fb2', 'mobi', 'prc', 'html', 'rtf', 'chm', 'pdf', 'txt']
-
-class KOGAN(SWEEX):
-
-    name           = 'Kogan Device Interface'
-    gui_name       = 'Kogan'
-    description    = _('Communicate with the Kogan')
-    VENDOR_NAME = 'LINUX'
-    WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = 'FILE-STOR_GADGET'
-    EBOOK_DIR_MAIN = 'Kogan eBooks'
 
 class PDNOVEL(USBMS):
     name = 'Pandigital Novel device interface'