diff --git a/pwnagotchi/ui/hw/waveshare1.py b/pwnagotchi/ui/hw/waveshare1.py
deleted file mode 100644
index 4716fc43..00000000
--- a/pwnagotchi/ui/hw/waveshare1.py
+++ /dev/null
@@ -1,90 +0,0 @@
-import logging
-
-import pwnagotchi.ui.fonts as fonts
-from pwnagotchi.ui.hw.base import DisplayImpl
-
-
-class WaveshareV1(DisplayImpl):
-    def __init__(self, config):
-        super(WaveshareV1, self).__init__(config, 'waveshare_1')
-        self._display = None
-
-    def layout(self):
-        if self.config['color'] == 'black':
-            fonts.setup(10, 9, 10, 35, 25, 9)
-            self._layout['width'] = 250
-            self._layout['height'] = 122
-            self._layout['face'] = (0, 40)
-            self._layout['name'] = (5, 20)
-            self._layout['channel'] = (0, 0)
-            self._layout['aps'] = (28, 0)
-            self._layout['uptime'] = (185, 0)
-            self._layout['line1'] = [0, 14, 250, 14]
-            self._layout['line2'] = [0, 108, 250, 108]
-            self._layout['friend_face'] = (0, 92)
-            self._layout['friend_name'] = (40, 94)
-            self._layout['shakes'] = (0, 109)
-            self._layout['mode'] = (225, 109)
-            self._layout['status'] = {
-                'pos': (125, 20),
-                'font': fonts.status_font(fonts.Medium),
-                'max': 20
-            }
-        else:
-            fonts.setup(10, 8, 10, 25, 25, 9)
-            self._layout['width'] = 212
-            self._layout['height'] = 104
-            self._layout['face'] = (0, 26)
-            self._layout['name'] = (5, 15)
-            self._layout['channel'] = (0, 0)
-            self._layout['aps'] = (28, 0)
-            self._layout['uptime'] = (147, 0)
-            self._layout['line1'] = [0, 12, 212, 12]
-            self._layout['line2'] = [0, 92, 212, 92]
-            self._layout['friend_face'] = (0, 76)
-            self._layout['friend_name'] = (40, 78)
-            self._layout['shakes'] = (0, 93)
-            self._layout['mode'] = (187, 93)
-            self._layout['status'] = {
-                'pos': (91, 15),
-                'font': fonts.status_font(fonts.Medium),
-                'max': 20
-            }
-        return self._layout
-
-    def initialize(self):
-        if self.config['color'] == 'black':
-            logging.info("initializing waveshare v1 display in monochromatic mode")
-            from pwnagotchi.ui.hw.libs.waveshare.v1.epd2in13 import EPD
-            self._display = EPD()
-            self._display.init(self._display.lut_full_update)
-            self._display.Clear(0xFF)
-            self._display.init(self._display.lut_partial_update)
-        elif self.config['color'] == 'fastAndFurious':
-            logging.info("initializing waveshare v1 3-color display in FAST MODE")
-            logging.info("THIS MAY BE POTENTIALLY DANGEROUS. NO WARRANTY IS PROVIDED")
-            logging.info("USE THIS DISPLAY IN THIS MODE AT YOUR OWN RISK")
-            from pwnagotchi.ui.hw.libs.waveshare.v1.epd2in13bcFAST import EPD
-            self._display = EPD()
-            self._display.init()
-            self._display.Clear()
-        else:
-            logging.info("initializing waveshare v1 display 3-color mode")
-            from pwnagotchi.ui.hw.libs.waveshare.v1.epd2in13bc import EPD
-            self._display = EPD()
-            self._display.init()
-            self._display.Clear()
-
-    def render(self, canvas):
-        if self.config['color'] == 'black':
-            buf = self._display.getbuffer(canvas)
-            self._display.display(buf)
-        elif self.config['color'] == 'fastAndFurious':
-            buf_black = self._display.getbuffer(canvas)
-            self._display.DisplayPartial(buf_black)
-        else:
-            buf_black = self._display.getbuffer(canvas)
-            self._display.displayBlack(buf_black)
-
-    def clear(self):
-        self._display.Clear(0xff)
diff --git a/pwnagotchi/ui/hw/waveshare2.py b/pwnagotchi/ui/hw/waveshare2.py
deleted file mode 100644
index fa00aafa..00000000
--- a/pwnagotchi/ui/hw/waveshare2.py
+++ /dev/null
@@ -1,69 +0,0 @@
-import logging
-
-import pwnagotchi.ui.fonts as fonts
-from pwnagotchi.ui.hw.base import DisplayImpl
-
-
-class WaveshareV2(DisplayImpl):
-    def __init__(self, config):
-        super(WaveshareV2, self).__init__(config, 'waveshare_2')
-        self._display = None
-
-    def layout(self):
-        if self.config['color'] == 'black':
-            fonts.setup(10, 9, 10, 35, 25, 9)
-            self._layout['width'] = 250
-            self._layout['height'] = 122
-            self._layout['face'] = (0, 40)
-            self._layout['name'] = (5, 20)
-            self._layout['channel'] = (0, 0)
-            self._layout['aps'] = (28, 0)
-            self._layout['uptime'] = (185, 0)
-            self._layout['line1'] = [0, 14, 250, 14]
-            self._layout['line2'] = [0, 108, 250, 108]
-            self._layout['friend_face'] = (0, 92)
-            self._layout['friend_name'] = (40, 94)
-            self._layout['shakes'] = (0, 109)
-            self._layout['mode'] = (225, 109)
-            self._layout['status'] = {
-                'pos': (125, 20),
-                'font': fonts.status_font(fonts.Medium),
-                'max': 20
-            }
-        else:
-            fonts.setup(10, 8, 10, 25, 25, 9)
-            self._layout['width'] = 212
-            self._layout['height'] = 104
-            self._layout['face'] = (0, 26)
-            self._layout['name'] = (5, 15)
-            self._layout['channel'] = (0, 0)
-            self._layout['aps'] = (28, 0)
-            self._layout['status'] = (91, 15)
-            self._layout['uptime'] = (147, 0)
-            self._layout['line1'] = [0, 12, 212, 12]
-            self._layout['line2'] = [0, 92, 212, 92]
-            self._layout['friend_face'] = (0, 76)
-            self._layout['friend_name'] = (40, 78)
-            self._layout['shakes'] = (0, 93)
-            self._layout['mode'] = (187, 93)
-            self._layout['status'] = {
-                'pos': (125, 20),
-                'font': fonts.status_font(fonts.Medium),
-                'max': 14
-            }
-        return self._layout
-
-    def initialize(self):
-        logging.info("initializing waveshare v2 display")
-        from pwnagotchi.ui.hw.libs.waveshare.v2.waveshare import EPD
-        self._display = EPD()
-        self._display.init(self._display.FULL_UPDATE)
-        self._display.Clear(0xff)
-        self._display.init(self._display.PART_UPDATE)
-
-    def render(self, canvas):
-        buf = self._display.getbuffer(canvas)
-        self._display.displayPartial(buf)
-
-    def clear(self):
-        self._display.Clear(0xff)
diff --git a/pwnagotchi/ui/hw/waveshare3.py b/pwnagotchi/ui/hw/waveshare3.py
deleted file mode 100644
index cb9e6586..00000000
--- a/pwnagotchi/ui/hw/waveshare3.py
+++ /dev/null
@@ -1,48 +0,0 @@
-import logging
-
-import pwnagotchi.ui.fonts as fonts
-from pwnagotchi.ui.hw.base import DisplayImpl
-
-
-class WaveshareV3(DisplayImpl):
-    def __init__(self, config):
-        super(WaveshareV3, self).__init__(config, 'waveshare_3')
-        self._display = None
-
-    def layout(self):
-        fonts.setup(10, 8, 10, 35, 25, 9)
-        self._layout['width'] = 250
-        self._layout['height'] = 122
-        self._layout['face'] = (0, 40)
-        self._layout['name'] = (5, 20)
-        self._layout['channel'] = (0, 0)
-        self._layout['aps'] = (28, 0)
-        self._layout['uptime'] = (185, 0)
-        self._layout['line1'] = [0, 14, 250, 14]
-        self._layout['line2'] = [0, 108, 250, 108]
-        self._layout['friend_face'] = (0, 92)
-        self._layout['friend_name'] = (40, 94)
-        self._layout['shakes'] = (0, 109)
-        self._layout['mode'] = (225, 109)
-        self._layout['status'] = {
-            'pos': (125, 20),
-            'font': fonts.status_font(fonts.Medium),
-            'max': 20
-        }
-
-        return self._layout
-
-    def initialize(self):
-        logging.info("initializing waveshare v3 display")
-        from pwnagotchi.ui.hw.libs.waveshare.v3.epd2in13_V3 import EPD
-        self._display = EPD()
-        self._display.init()
-        self._display.Clear(0xFF)
-
-    def render(self, canvas):
-        buf = self._display.getbuffer(canvas)
-        self._display.displayPartial(buf)
-
-    def clear(self):
-        #pass
-        self._display.Clear(0xFF)
diff --git a/pwnagotchi/ui/hw/waveshare4.py b/pwnagotchi/ui/hw/waveshare4.py
deleted file mode 100644
index 35f1e2e8..00000000
--- a/pwnagotchi/ui/hw/waveshare4.py
+++ /dev/null
@@ -1,46 +0,0 @@
-import logging
-
-import pwnagotchi.ui.fonts as fonts
-from pwnagotchi.ui.hw.base import DisplayImpl
-
-
-class WaveshareV4(DisplayImpl):
-    def __init__(self, config):
-        super(WaveshareV4, self).__init__(config, 'waveshare_4')
-        self._display = None
-
-    def layout(self):
-        fonts.setup(10, 9, 10, 35, 25, 9)
-        self._layout['width'] = 250
-        self._layout['height'] = 122
-        self._layout['face'] = (0, 40)
-        self._layout['name'] = (5, 20)
-        self._layout['channel'] = (0, 0)
-        self._layout['aps'] = (28, 0)
-        self._layout['uptime'] = (185, 0)
-        self._layout['line1'] = [0, 14, 250, 14]
-        self._layout['line2'] = [0, 108, 250, 108]
-        self._layout['friend_face'] = (0, 92)
-        self._layout['friend_name'] = (40, 94)
-        self._layout['shakes'] = (0, 109)
-        self._layout['mode'] = (225, 109)
-        self._layout['status'] = {
-            'pos': (125, 20),
-            'font': fonts.status_font(fonts.Medium),
-            'max': 20
-        }
-        return self._layout
-
-    def initialize(self):
-        logging.info("initializing waveshare v4 display")
-        from pwnagotchi.ui.hw.libs.waveshare.v4.epd2in13_V4 import EPD
-        self._display = EPD()
-        self._display.init()
-        self._display.Clear(0xFF)
-
-    def render(self, canvas):
-        buf = self._display.getbuffer(canvas)
-        self._display.displayPartial(buf)
-
-    def clear(self):
-        self._display.Clear(0xFF)
\ No newline at end of file
diff --git a/pyproject.toml b/pyproject.toml
index 6a907986..1dbe7854 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -53,8 +53,8 @@ classifiers = [
 [project.urls]
 Homepage = "https://pwnagotchi.ai/"
 Documentation = "https://pwnagotchi.ai/"
-Repository = "https://github.com/jayofelony/pwnagotchi-bookworm.git"
-"Bug Tracker" = "https://github.com/jayofelony/pwnagotchi-bookworm.git/issues"
+Repository = "https://github.com/jayofelony/pwnagotchi-bookworm"
+"Bug Tracker" = "https://github.com/jayofelony/pwnagotchi-bookworm/issues"
 
 [project.scripts]
 pwnagotchi_cli = "bin.pwnagotchi:pwnagotchi_cli"
\ No newline at end of file