diff --git a/megaavr/libraries/Wire/src/twi_pins.c b/megaavr/libraries/Wire/src/twi_pins.c
index 6f65970f..8a16fd7f 100644
--- a/megaavr/libraries/Wire/src/twi_pins.c
+++ b/megaavr/libraries/Wire/src/twi_pins.c
@@ -365,383 +365,3 @@ bool TWI0_swap(uint8_t state) {
     }
   #endif
   return false;
-}
-
-
-void TWI0_usePullups() {
-  // make sure we don't get errata'ed: Clear the pins
-  // and then turn on the pullups.
-  #if defined(PORTMUX_TWIROUTEA) // Dx or Ex-series
-    uint8_t portmux = PORTMUX.TWIROUTEA & PORTMUX_TWI0_gm;
-    PORT_t *port;
-    // PORTA and PORTC are present on all parts with a TWIROUTEA register
-    if(portmux == PORTMUX_TWI0_ALT2_gc) {
-      port = &PORTC;
-    } else {
-      port = &PORTA;
-    }
-    #if !defined(__AVR_DA__) && !defined(__AVR_DB__) //DD and EA, and presumably later parts, have an extra mux option.
-      if (portmux == 3) {
-        port->OUTCLR    = 0x03;  // bits 0 and 1
-        port->PIN0CTRL |= PORT_PULLUPEN_bm;
-        port->PIN1CTRL |= PORT_PULLUPEN_bm;
-      } else
-    #endif
-    {
-      port->OUTCLR    = 0x0C;  // bits 2 and 3
-      port->PIN2CTRL |= PORT_PULLUPEN_bm;
-      port->PIN3CTRL |= PORT_PULLUPEN_bm;
-    }
-    #if defined(TWI0_DUALCTRL)   //Also handle slave pins, if enabled
-      if (TWI0.DUALCTRL & TWI_ENABLE_bm) {
-        #if !(defined(__AVR_DA__) || defined(__AVR_DB__))
-          if (portmux == PORTMUX_TWI0_DEFAULT_gc ||
-              portmux == PORTMUX_TWI0_ALT3_gc) {
-            PORTC.OUTCLR    = 0x0C;
-            PORTC.PIN2CTRL |= PORT_PULLUPEN_bm;
-            PORTC.PIN3CTRL |= PORT_PULLUPEN_bm;
-          }
-        #else
-          if (portmux == PORTMUX_TWI0_DEFAULT_gc) {
-            PORTC.OUTCLR    = 0x0C;  // bits 2 and 3
-            PORTC.PIN2CTRL |= PORT_PULLUPEN_bm;
-            PORTC.PIN3CTRL |= PORT_PULLUPEN_bm;
-          } else {
-            PORTC.OUTCLR    = 0xC0;  // bits 6 and 7
-            PORTC.PIN6CTRL |= PORT_PULLUPEN_bm;
-            PORTC.PIN7CTRL |= PORT_PULLUPEN_bm;
-          }
-        #endif
-      }
-    #endif
-  #elif defined(PORTMUX_TWISPIROUTEA) // megaAVR 0-series
-    uint8_t portmux = PORTMUX.TWISPIROUTEA & PORTMUX_TWI0_gm;
-    PORT_t *port;
-    // Note that all megaAVR 0-series parts have a PORTA, PORTC and PORTF!
-    if(portmux == PORTMUX_TWI0_ALT2_gc) {
-      port = &PORTC;
-    } else {
-      port = &PORTA;
-    }
-    port->OUTCLR    = 0x0C;  // bits 2 and 3
-    port->PIN2CTRL |= PORT_PULLUPEN_bm;
-    port->PIN3CTRL |= PORT_PULLUPEN_bm;
-    #if defined(TWI0_DUALCTRL)   //Also handle slave pins, if enabled
-      if (TWI0.DUALCTRL & TWI_ENABLE_bm) {
-        if (portmux == PORTMUX_TWI0_DEFAULT_gc) {
-          port = &PORTC;
-        } else {
-          port = &PORTF;
-        }
-        port->OUTCLR    = 0x0C;  // bits 2 and 3
-        port->PIN2CTRL |= PORT_PULLUPEN_bm;
-        port->PIN3CTRL |= PORT_PULLUPEN_bm;
-      }
-    #endif
-  #elif defined(MEGATINYCORE) && MEGATINYCORE_SERIES != 2  /* tinyAVR 0/1-series */
-    #if defined(PORTMUX_TWI0_bm) // 1-series with remappable TWI
-      if (true == (PORTMUX.CTRLB & PORTMUX_TWI0_bm)) {
-        PORTA.OUTCLR    = 0x06;
-        PORTA.PIN2CTRL |= PORT_PULLUPEN_bm;
-        PORTA.PIN1CTRL |= PORT_PULLUPEN_bm;
-      } else {
-        PORTB.OUTCLR    = 0x03;  // bits 1 and 0.
-        PORTB.PIN1CTRL |= PORT_PULLUPEN_bm;
-        PORTB.PIN0CTRL |= PORT_PULLUPEN_bm;
-      }
-    #elif defined(__AVR_ATtinyxy2__) // 8-pin 0/1-series part
-      PORTA.OUTCLR    = 0x06;  // bits 2 and 1.
-      PORTA.PIN2CTRL |= PORT_PULLUPEN_bm;
-      PORTA.PIN1CTRL |= PORT_PULLUPEN_bm;
-    #else // 0-series or 2-series part with no remapping options
-      PORTB.OUTCLR    = 0x03;  // bits 1 and 0.
-      PORTB.PIN1CTRL |= PORT_PULLUPEN_bm;
-      PORTB.PIN0CTRL |= PORT_PULLUPEN_bm;
-    #endif
-  #endif
-}
-
-//Check if TWI0 Master pins have a HIGH level: Bit0 = SDA, Bit 1 = SCL
-uint8_t TWI0_checkPinLevel(void) {
-  #if defined(PORTMUX_TWIROUTEA)     /* Dx-series */
-    uint8_t portmux = (PORTMUX.TWIROUTEA & PORTMUX_TWI0_gm);
-    VPORT_t *vport;
-    if (portmux == PORTMUX_TWI0_ALT2_gc) {
-      vport = &VPORTC;
-    } else {
-      vport = &VPORTA;
-    }
-
-    #if !defined(__AVR_DA__) && !defined(__AVR_DB__) //DD and EA, and presumably later parts, have an extra mux option.
-      if (portmux == 3) {
-        return (vport->IN & 0x03);
-      } else
-    #endif
-    {
-      return ((vport->IN & 0x0C) >> 2);
-    }
-  #elif defined(PORTMUX_TWISPIROUTEA)
-    uint8_t portmux = (PORTMUX.TWISPIROUTEA & PORTMUX_TWI0_gm);
-    VPORT_t *vport;
-    if (portmux == PORTMUX_TWI0_ALT2_gc) {
-      vport = &VPORTC;
-    } else {
-      vport = &VPORTA;
-    }
-    return ((vport->IN & 0x0C) >> 2);
-  #elif defined(MEGATINYCORE)  /* tinyAVR 0/1-series */
-    #if defined(PORTMUX_TWI0_bm)  // Has a pin multiplexer
-      if (true == (PORTMUX.CTRLB & PORTMUX_TWI0_bm)) {
-        return ((VPORTA.IN & 0x06) >> 1);
-      } else {
-        return (VPORTB.IN & 0x03);
-      }
-    #elif defined(__AVR_ATtinyxy2__)  // No PORTMUX for 8-pin parts, they always use PA1/2
-      return ((VPORTA.IN & 0x06) >> 1);
-    #else //it uses PB0/1
-      return (VPORTB.IN & 0x03);
-    #endif
-  #else
-    #error "Only modern AVR parts are supported by this version of Wire: tinyAVR 0/1/2-series, megaAVR 0-series, AVR Dx-series or AVR Ex-series."
-    return 0;
-  #endif
-}
-
-#if defined(TWI0_DUALCTRL) // full version for parts with dual mode and likely input level too
-  uint8_t TWI0_setConfig(bool smbuslvl, bool longsetup, uint8_t sda_hold, bool smbuslvl_dual, uint8_t sda_hold_dual) {
-    uint8_t cfg = TWI0.CTRLA & 0x03;
-    sda_hold <<= 2; // get these into the right place in the byte
-
-    if (smbuslvl) {
-      cfg |= 0x40;
-    }
-    if (longsetup) {
-      cfg |= 0x10;
-    }
-    cfg |= sda_hold;
-    TWI0.CTRLA = cfg;
-    #if defined(TWI0_DUALCTRL)
-      sda_hold_dual <<= 2;
-      uint8_t cfg_dual = TWI0.DUALCTRL & 0x03;
-      if (cfg_dual & 1) {
-        cfg_dual |= sda_hold_dual;
-        if (smbuslvl_dual) {
-          cfg_dual |= 0x40;
-        }
-        TWI0.DUALCTRL = cfg_dual;
-      } else if (sda_hold_dual || smbuslvl_dual) {
-        return 0x04; // dual mode exists on this part, but is not enabled. This signifies a failure to follow documented startup order
-      }
-     #endif
-     return 0; // return success - all other errors are checked for before this is called.
-  }
-#else // very little to do here on tiny, do save flash with a smaller implementation.
-  uint8_t TWI0_setConfig(bool longsetup, uint8_t sda_hold) {
-    uint8_t cfg = TWI0.CTRLA & 0x03;
-    if (longsetup) {
-      cfg |= 0x10;
-    }
-    cfg |= sda_hold;
-    TWI0.CTRLA = cfg;
-    return 0; // return success - all other errors are checked for before this is called.
-  }
-#endif
-
-
-#if defined(TWI1)
-void TWI1_ClearPins() {
-  #if defined(PIN_WIRE1_SDA_PINSWAP_2) || defined(TWI1_DUALCTRL)
-    uint8_t portmux = PORTMUX.TWIROUTEA & PORTMUX_TWI1_gm;
-  #endif
-  #if defined(PIN_WIRE1_SDA_PINSWAP_2)
-    if (portmux == PORTMUX_TWI1_ALT2_gc) {  // make sure we don't get errata'ed
-      #if defined(PORTB)
-        PORTB.OUTCLR = 0x0C;  // bits 2 and 3
-      #endif
-    } else
-  #endif
-  {
-    PORTF.OUTCLR = 0x0C;  // bits 2 and 3
-  }
-  #if defined(TWI1_DUALCTRL)
-    #if defined(PORTB)
-      if (TWI1.DUALCTRL & TWI_ENABLE_bm) {
-        if (portmux == PORTMUX_TWI1_DEFAULT_gc) {
-          PORTB.OUTCLR = 0x0C;  // bits 2 and 3
-        } else {
-          PORTB.OUTCLR = 0xC0;  // bits 6 and 7
-        }
-      }
-    #endif
-  #endif
-  (void) portmux; //this is grabbed early, but depending on which part and hence what is conditionally compiled, may not go into the code. It will produce spurious warnings without this line
-}
-
-
-bool TWI1_Pins(uint8_t sda_pin, uint8_t scl_pin) {
-  #if (defined(PIN_WIRE1_SDA_PINSWAP_1) || defined(PIN_WIRE1_SDA_PINSWAP_2))
-    // Danger: 'portmux' in this context means all the other settings in portmux, since we're replacing the PORTMUX setting for TWI1, and will bitwise-or with the _gc constants.
-    // Elsewhere, 'portmux' refers to the setting for this peripheral only, and we compare it to PORTMUX_TWI1_xxx_gc
-    uint8_t portmux = PORTMUX.TWIROUTEA & ~PORTMUX_TWI1_gm;
-    #if defined(PIN_WIRE1_SDA_PINSWAP_2)
-      if (sda_pin == PIN_WIRE1_SDA_PINSWAP_2 && scl_pin == PIN_WIRE1_SCL_PINSWAP_2) {
-        // Use pin swap
-        PORTMUX.TWIROUTEA = portmux | PORTMUX_TWI1_ALT2_gc;
-        return true;
-      } else
-    #endif
-    #if defined(PIN_WIRE1_SDA_PINSWAP_1)
-      if (sda_pin == PIN_WIRE1_SDA_PINSWAP_1 && scl_pin == PIN_WIRE1_SCL_PINSWAP_1) {
-        PORTMUX.TWIROUTEA = portmux | PORTMUX_TWI1_ALT1_gc;
-        return true;
-      } else
-    #endif
-    #if defined(PIN_WIRE1_SDA)
-      if (sda_pin == PIN_WIRE1_SDA && scl_pin == PIN_WIRE1_SCL) {
-        // Use default configuration
-        PORTMUX.TWIROUTEA = portmux;
-        return true;
-      } else {
-        // Assume default configuration
-        PORTMUX.TWIROUTEA = portmux;
-        return false;
-      }
-    #endif
-  #else  // No TWI1 pin options - why call this?
-    if (__builtin_constant_p(sda_pin) && __builtin_constant_p(scl_pin)) {
-      /* constant case - error if there's no swap and the swap attempt is known at compile time */
-      if (sda_pin != PIN_WIRE1_SDA || scl_pin != PIN_WIRE1_SCL) {
-        badCall("This part does not support alternate Wire1 pins, if Wire1.pins() is called, it must be passed the default pins");
-        return false;
-      } else {
-        return true;
-      }
-    } else { /* Non-constant case */
-      return (sda_pin == PIN_WIRE1_SDA && scl_pin == PIN_WIRE1_SCL);
-    }
-  #endif
-  return false;
-}
-
-
-
-bool TWI1_swap(uint8_t state) {
-  // Danger: 'portmux' in this context means all the other settings in portmux, since we're replacing the PORTMUX setting for TWI1, and will bitwise-or with the _gc constants.
-  // Elsewhere, 'portmux' refers to the setting for this peripheral only, and we compare it to PORTMUX_TWI1_xxx_gc
-  uint8_t portmux = PORTMUX.TWIROUTEA & (~PORTMUX_TWI1_gm);
-  #if defined(PIN_WIRE1_SDA_PINSWAP_2)
-    if (state == 2) {
-      // Use pin swap
-      PORTMUX.TWIROUTEA = portmux | PORTMUX_TWI1_ALT2_gc;
-      return true;
-    } else
-  #endif
-  #if defined(PIN_WIRE1_SDA_PINSWAP_1)
-    if (state == 1) {
-      // Use pin swap
-      PORTMUX.TWIROUTEA = portmux | PORTMUX_TWI1_ALT1_gc;
-      return true;
-    } else
-  #endif
-  #if defined(PIN_WIRE1_SDA)
-    if (state == 0) {
-      // Use default configuration
-      PORTMUX.TWIROUTEA = portmux;
-      return true;
-    } else {
-      // Assume default configuration
-      PORTMUX.TWIROUTEA = portmux;
-      return false;
-    }
-  #else
-    {
-      // Assume default configuration
-      PORTMUX.TWIROUTEA = portmux | PORTMUX_TWI1_ALT2_gc;
-      return false;
-    }
-  #endif
-  return false;
-}
-
-
-void TWI1_usePullups() {
-  #if defined(PIN_WIRE1_SDA_PINSWAP_2) || defined(TWI1_DUALCTRL)
-    uint8_t portmux = PORTMUX.TWIROUTEA & PORTMUX_TWI1_gm;
-  #endif
-  PORT_t *port;
-  #if defined(PORTB) //All parts with a TWI1 have a PORTF
-    if (portmux == PORTMUX_TWI1_ALT2_gc) {
-      port = &PORTB;
-    } else {
-      port = &PORTF;
-    }
-  #else
-    port = &PORTF;
-  #endif
-
-  port->OUTCLR = 0x0C;  // bits 2 and 3
-  port->PIN2CTRL |= PORT_PULLUPEN_bm;
-  port->PIN3CTRL |= PORT_PULLUPEN_bm;
-
-  #if defined(TWI0_DUALCTRL) && defined(PORTB)
-    if (TWI1.DUALCTRL & TWI_ENABLE_bm) {
-      if (portmux == PORTMUX_TWI1_DEFAULT_gc) {
-        PORTB.OUTCLR = 0x0C;  // bits 2 and 3
-        PORTB.PIN2CTRL |= PORT_PULLUPEN_bm;
-        PORTB.PIN3CTRL |= PORT_PULLUPEN_bm;
-      } else {
-        PORTB.OUTCLR = 0xC0;  // bits 6 and 7
-        PORTB.PIN6CTRL |= PORT_PULLUPEN_bm;
-        PORTB.PIN7CTRL |= PORT_PULLUPEN_bm;
-      }
-    }
-  #endif
-  (void) portmux; //this is grabbed early, but depending on which part and hence what is conditionally compiled, may not go into the code. It will produce spurious warnings without this line
-}
-
-//Check if TWI1 Master pins have a HIGH level: Bit0 = SDA, Bit 1 = SCL
-uint8_t TWI1_checkPinLevel(void) {
-  // we do it this way because when accessed using a pointer, it's no longer any faster to use VPORTx
-  #if defined(PORTB) //All parts with a TWI1 have a PORTF
-    uint8_t portmux = PORTMUX.TWIROUTEA & PORTMUX_TWI1_gm;
-    if (portmux == PORTMUX_TWI1_ALT2_gc) {
-      return ((VPORTB.IN & 0x0C) >> 2);
-    } else {
-      return ((VPORTF.IN & 0x0C) >> 2);
-    }
-  #else
-    return ((VPORTF.IN & 0x0C) >> 2);
-  #endif
-}
-
-// All devices with TWI1 have dual mode and the most have the smbus levels; the exceptions are caught before this is called
-uint8_t TWI1_setConfig(bool smbuslvl, bool longsetup, uint8_t sda_hold, bool smbuslvl_dual, uint8_t sda_hold_dual) {
-  uint8_t cfg = TWI1.CTRLA & 0x03;
-  if (smbuslvl) {
-    cfg |= 0x40;
-  }
-  if (longsetup) {
-    cfg |= 0x10;
-  }
-  cfg |= sda_hold;
-  TWI1.CTRLA = cfg;
-  #if defined(TWI1_DUALCTRL)
-    uint8_t cfg_dual = TWI1.DUALCTRL & 0x03;
-    if (cfg_dual & 1) {
-      cfg_dual |= sda_hold_dual;
-      if (smbuslvl_dual) {
-        cfg_dual = 0x40;
-      }
-      TWI1.DUALCTRL = cfg_dual;
-    } else if (sda_hold_dual || smbuslvl_dual) {
-      return 0x04;
-    }
-  #endif
-  return 0;
-}
-
-
-
-#endif  /* defined(TWI1) */
-
-#endif /* TWI_PINS_H */