diff --git a/src/RollingCode.h b/src/RollingCode.h
index 67fba39..7eb58fe 100644
--- a/src/RollingCode.h
+++ b/src/RollingCode.h
@@ -2,7 +2,7 @@
 #define ROLLING_CODE_H
 #include <stdint.h>
 
-// Working out a remote's next rolling code (src/Somfy.cpp).  Kept free of NVS
+// Working out a remote's next rolling code (src/SomfyRemote.cpp).  Kept free of NVS
 // so it can be unit tested on the PC (pio test -e native).
 
 // The code the next frame uses.  It is only read here and consumed once the
diff --git a/src/Somfy.cpp b/src/SomfyShade.cpp
similarity index 99%
rename from src/Somfy.cpp
rename to src/SomfyShade.cpp
index 4f3ba40..c49c837 100644
--- a/src/Somfy.cpp
+++ b/src/SomfyShade.cpp
@@ -1,32 +1,11 @@
 #include <Preferences.h>
-#include <ELECHOUSE_CC1101_SRC_DRV.h>
-#include <SPI.h>
-#include <esp_task_wdt.h>
-#include <freertos/queue.h>
-#include <freertos/semphr.h>
-#include <atomic>
-#include <esp_chip_info.h>
-#include "driver/gpio.h"
 #include "esp_log.h"
-#include "Utils.h"
-#include "ConfigSettings.h"
 #include "Somfy.h"
 #include "ShadeMotion.h"
-#include "RollingCode.h"
-#include "Sockets.h"
-#include "MQTT.h"
-#include "ConfigFile.h"
-#include "GitOTA.h"
 
 static const char *TAG = "Somfy";
 
 extern SomfyShadeController somfy;
-extern SocketEmitter sockEmit;
-extern ConfigSettings settings;
-extern MQTTClass mqtt;
-extern GitUpdater git;
-
-
 
 #define SETMY_REPEATS 35
 #define TILT_REPEATS 15