diff --git a/src/JsonStruct.h b/src/JsonStruct.h
index cee2114..6b21a7d 100644
--- a/src/JsonStruct.h
+++ b/src/JsonStruct.h
@@ -16,10 +16,8 @@ struct JsonStruct {
     virtual void fromJsonObject(JsonObject& json);
     virtual int verifyJsonObject(JsonObject& json){
         return json.success();
-            //&& json.containsKey(JSON_DOMAIN)
     };
     String toJsonString(){
-        //StaticJsonBuffer<200> StringjsonBuffer;
         DynamicJsonBuffer jsonBuffer(JSON_ARRAY_SIZE(300));
         JsonObject& root = jsonBuffer.createObject();
         mapJsonObject(root);
@@ -44,7 +42,6 @@ struct JsonStruct {
     // Map a json object to this struct.
     // Parse a json string and map parsed object
     void fromJsonString(String& str){
-        //StaticJsonBuffer<200> jsonBuffer;
         DynamicJsonBuffer jsonBuffer(JSON_ARRAY_SIZE(300));
         JsonObject& json = jsonBuffer.parseObject(str);
         valid = verifyJsonObject(json);
@@ -56,13 +53,6 @@ struct JsonStruct {
     void fromFile(const char* path) {
         File configFile = SPIFFS.open(path, "r");
         String cfgFileStr = configFile.readString();
-        
-        // Allocate a buffer to store contents of the file.
-        //size_t size = configFile.size();
-        //std::unique_ptr<char[]> buf(new char[size]);
-        //configFile.readBytes(buf.get(), size);
-        //StaticJsonBuffer<1024> jsonBuffer;
-        //JsonObject& json = jsonBuffer.parseObject(buf.get());
         DynamicJsonBuffer jsonBuffer;
         JsonObject& json = jsonBuffer.parseObject(cfgFileStr);
         
diff --git a/src/Sprocket.cpp b/src/Sprocket.cpp
index 619781f..7a63ec0 100644
--- a/src/Sprocket.cpp
+++ b/src/Sprocket.cpp
@@ -13,25 +13,13 @@ Sprocket* Sprocket::init(SprocketConfig cfg){
     delay(cfg.startupDelay);
     Serial.begin(cfg.serialBaudRate);
     SPIFFS.begin();
+    scheduler = new Scheduler();
     return this;
 }
 Sprocket* Sprocket::activate() {
-    scheduler = new Scheduler();
     activatePlugins(scheduler);
     return activate(scheduler);
 }
-Sprocket* Sprocket::activate(Scheduler* s) {
-    return this;
-}
-
-// TODO check if we want to remove network from sprocket and handle everything via plugins
-Sprocket* Sprocket::join(Network& net){
-    Serial.println("join network");
-    net.init(scheduler);
-    net.connect();
-    network = net;
-    return activate(scheduler);
-}
 
 Sprocket* Sprocket::addTask(Task& tsk){
     scheduler->addTask(tsk);
diff --git a/src/Sprocket.h b/src/Sprocket.h
index 8660a6c..b192f2a 100644
--- a/src/Sprocket.h
+++ b/src/Sprocket.h
@@ -37,11 +37,10 @@ class Sprocket : public Mediator {
         Sprocket();
         Sprocket(SprocketConfig);
         Sprocket* init(SprocketConfig);
-        Sprocket* join(Network&);
         Sprocket* addTask(Task&);
         virtual void loop();
         virtual Sprocket* activate();
-        virtual Sprocket* activate(Scheduler*);
+        virtual Sprocket* activate(Scheduler*) { return this; };
         virtual void dispatch( uint32_t from, String &msg );
 
         void addPlugin(Plugin* p);