diff --git a/boards.txt b/boards.txt
index 3cc72a0f0..4190e6483 100644
--- a/boards.txt
+++ b/boards.txt
@@ -72,7 +72,7 @@ modwifi.build.mcu=esp8266
 modwifi.build.f_cpu=80000000L
 modwifi.build.board=MOD_WIFI_ESP8266
 modwifi.build.core=esp8266
-modwifi.build.variant=modwifi
+modwifi.build.variant=generic
 # Winbond W25Q16 flash
 modwifi.build.flash_mode=qio
 modwifi.build.flash_size=2M
@@ -103,9 +103,6 @@ modwifi.menu.UploadSpeed.512000.upload.speed=512000
 modwifi.menu.UploadSpeed.921600=921600
 modwifi.menu.UploadSpeed.921600.upload.speed=921600
 
-modwifi.menu.FlashSize.2M=2M
-modwifi.menu.FlashSize.2M.build.flash_size=2M
-
 ##############################################################
 nodemcu.name=NodeMCU (ESP8266 ESP-12 Module)
 
diff --git a/variants/modwifi/pins_arduino.h b/variants/modwifi/pins_arduino.h
deleted file mode 100644
index 4fef366d0..000000000
--- a/variants/modwifi/pins_arduino.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-  pins_arduino.h - Pin definition functions for Arduino
-  Part of Arduino - http://www.arduino.cc/
-
-  Copyright (c) 2007 David A. Mellis
-  Modified for ESP8266 platform by Ivan Grokhotkov, 2014-2015.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General
-  Public License along with this library; if not, write to the
-  Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-  Boston, MA  02111-1307  USA
-
-  $Id: wiring.h 249 2007-02-03 16:52:51Z mellis $
-*/
-
-#ifndef Pins_Arduino_h
-#define Pins_Arduino_h
-
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        17
-#define NUM_ANALOG_INPUTS       1
-
-#define analogInputToDigitalPin(p)	((p > 0)?NOT_A_PIN:0)
-#define digitalPinToInterrupt(p)	(((p) < EXTERNAL_NUM_INTERRUPTS)?p:NOT_A_PIN)
-#define digitalPinHasPWM(p)		(((p) < NUM_DIGITAL_PINS)?p:NOT_A_PIN)
-
-static const uint8_t SDA = 4;
-static const uint8_t SCL = 5;
-
-static const uint8_t SS    = 15;
-static const uint8_t MOSI  = 13;
-static const uint8_t MISO  = 12;
-static const uint8_t SCK   = 14;
-
-static const uint8_t A0 = 17;
-
-// These serial port names are intended to allow libraries and architecture-neutral
-// sketches to automatically default to the correct port name for a particular type
-// of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
-// the first hardware serial port whose RX/TX pins are not dedicated to another use.
-//
-// SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
-//
-// SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
-//
-// SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
-//
-// SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
-//
-// SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
-//                            pins are NOT connected to anything by default.
-#define SERIAL_PORT_MONITOR        Serial
-#define SERIAL_PORT_USBVIRTUAL     Serial
-#define SERIAL_PORT_HARDWARE       Serial
-#define SERIAL_PORT_HARDWARE_OPEN  Serial
-
-#endif /* Pins_Arduino_h */