diff --git a/cores/arduino/PluggableUSB.h b/cores/arduino/PluggableUSB.h
index d12c4c4..1f3057a 100644
--- a/cores/arduino/PluggableUSB.h
+++ b/cores/arduino/PluggableUSB.h
@@ -31,9 +31,6 @@ public:
     numEndpoints(numEps), numInterfaces(numIfs), endpointType(epType)
   { }
 
-  inline uint8_t interface() const { return pluggedInterface; }
-  inline uint8_t endpoint()   const { return pluggedEndpoint; }
-
 protected:
   virtual bool setup(USBSetup& setup) = 0;
   virtual int getInterface(uint8_t* interfaceCount) = 0;
diff --git a/libraries/HID/HID.cpp b/libraries/HID/HID.cpp
index fe88ecd..762d170 100644
--- a/libraries/HID/HID.cpp
+++ b/libraries/HID/HID.cpp
@@ -31,16 +31,16 @@ int HID_::getInterface(uint8_t* interfaceCount)
 {
 	*interfaceCount += 1; // uses 1
 	HIDDescriptor hidInterface = {
-		D_INTERFACE(interface(), 1, 3, 0, 0),
+		D_INTERFACE(pluggedInterface, 1, 3, 0, 0),
 		D_HIDREPORT(descriptorSize),
-		D_ENDPOINT(USB_ENDPOINT_IN(endpoint()), USB_ENDPOINT_TYPE_INTERRUPT, USB_EP_SIZE, 0x01)
+		D_ENDPOINT(USB_ENDPOINT_IN(pluggedEndpoint), USB_ENDPOINT_TYPE_INTERRUPT, USB_EP_SIZE, 0x01)
 	};
 	return USB_SendControl(0, &hidInterface, sizeof(hidInterface));
 }
 
 int HID_::getDescriptor(USBSetup& setup)
 {
-	if (interface() != setup.wIndex) {
+	if (pluggedInterface != setup.wIndex) {
 		return 0;
 	}
 
@@ -71,13 +71,13 @@ void HID_::AppendDescriptor(HIDDescriptorListNode *node)
 
 void HID_::SendReport(uint8_t id, const void* data, int len)
 {
-	USB_Send(endpoint(), &id, 1);
-	USB_Send(endpoint() | TRANSFER_RELEASE, data, len);
+	USB_Send(pluggedEndpoint, &id, 1);
+	USB_Send(pluggedEndpoint | TRANSFER_RELEASE, data, len);
 }
 
 bool HID_::setup(USBSetup& setup)
 {
-	if (interface() != setup.wIndex) {
+	if (pluggedInterface != setup.wIndex) {
 		return false;
 	}