Index: src/hid/OFEvdevGameController.m
==================================================================
--- src/hid/OFEvdevGameController.m
+++ src/hid/OFEvdevGameController.m
@@ -83,12 +83,10 @@
 buttonToName(uint16_t button, uint16_t vendorID, uint16_t productID)
 {
 	if (vendorID == vendorIDNintendo &&
 	    productID == productIDLeftJoycon) {
 		switch (button) {
-		case BTN_SELECT:
-			return OFGameControllerMinusButton;
 		case BTN_Z:
 			return OFGameControllerCaptureButton;
 		case BTN_TR:
 			return OFGameControllerSLButton;
 		case BTN_TR2:
@@ -99,12 +97,10 @@
 		switch (button) {
 		case BTN_NORTH:
 			return OFGameControllerNorthButton;
 		case BTN_WEST:
 			return OFGameControllerWestButton;
-		case BTN_START:
-			return OFGameControllerPlusButton;
 		case BTN_TL:
 			return OFGameControllerSLButton;
 		case BTN_TL2:
 			return OFGameControllerSRButton;
 		}

Index: src/hid/OFGameController.h
==================================================================
--- src/hid/OFGameController.h
+++ src/hid/OFGameController.h
@@ -69,12 +69,10 @@
  *  * @ref OFGameControllerZButton
  *  * @ref OFGameControllerCPadUpButton
  *  * @ref OFGameControllerCPadDownButton
  *  * @ref OFGameControllerCPadLeftButton
  *  * @ref OFGameControllerCPadRightButton
- *  * @ref OFGameControllerPlusButton
- *  * @ref OFGameControllerMinusButton
  *  * @ref OFGameControllerSLButton
  *  * @ref OFGameControllerSRButton
  *  * @ref OFGameControllerModeButton
  */
 typedef OFConstantString *OFGameControllerButton;
@@ -221,20 +219,10 @@
 /**
  * @brief The C-Pad Right button on a game controller.
  */
 extern const OFGameControllerButton OFGameControllerCPadRightButton;
 
-/**
- * @brief The + button on a game controller.
- */
-extern const OFGameControllerButton OFGameControllerPlusButton;
-
-/**
- * @brief The - button on a game controller.
- */
-extern const OFGameControllerButton OFGameControllerMinusButton;
-
 /**
  * @brief The SL button on a game controller.
  */
 extern const OFGameControllerButton OFGameControllerSLButton;
 

Index: src/hid/OFGameController.m
==================================================================
--- src/hid/OFGameController.m
+++ src/hid/OFGameController.m
@@ -67,12 +67,10 @@
 const OFGameControllerButton OFGameControllerZButton = @"Z";
 const OFGameControllerButton OFGameControllerCPadUpButton = @"C-Pad Up";
 const OFGameControllerButton OFGameControllerCPadDownButton = @"C-Pad Down";
 const OFGameControllerButton OFGameControllerCPadLeftButton = @"C-Pad Left";
 const OFGameControllerButton OFGameControllerCPadRightButton = @"C-Pad Right";
-const OFGameControllerButton OFGameControllerPlusButton = @"+";
-const OFGameControllerButton OFGameControllerMinusButton = @"-";
 const OFGameControllerButton OFGameControllerSLButton = @"SL";
 const OFGameControllerButton OFGameControllerSRButton = @"SR";
 const OFGameControllerButton OFGameControllerModeButton = @"Mode";
 const OFGameControllerButton OFGameControllerAssistantButton = @"Assistant";