diff --git a/LICENSE.txt b/LICENSE.txt
index ab6f63d..817eab1 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2017-2021 Jake Buchholz Göktürk, Michael Crute
+Copyright (c) 2017-2022 Jake Buchholz Göktürk, Michael Crute
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
diff --git a/etc/init.d/tiny-cloud b/etc/init.d/tiny-cloud
index 2a0222d..6155f3a 100755
--- a/etc/init.d/tiny-cloud
+++ b/etc/init.d/tiny-cloud
@@ -11,8 +11,6 @@ depend() {
 start() {
 	source /lib/tiny-cloud/init-main
 
-	# TODO: background tiny-cloud network watcher?
-
 	is_bootstrapped && return 0
 
 	ebegin "Setting Instance Hostname"
diff --git a/lib/tiny-cloud/init-common b/lib/tiny-cloud/init-common
index d7ca324..c172ac3 100644
--- a/lib/tiny-cloud/init-common
+++ b/lib/tiny-cloud/init-common
@@ -1,6 +1,8 @@
 # Tiny Cloud - Common Initialization
 # vim:set ts=4 et ft=sh:
 
+source /etc/conf.d/tiny-cloud
+
 # set defaults
 CLOUD_USER=${CLOUD_USER:-alpine}
 CLOUD_USERDATA=${CLOUD_USERDATA:-user-data}
diff --git a/lib/tiny-cloud/init-early b/lib/tiny-cloud/init-early
index 65551ee..e429fda 100644
--- a/lib/tiny-cloud/init-early
+++ b/lib/tiny-cloud/init-early
@@ -1,7 +1,6 @@
 # Tiny Cloud - Early Phase Functions
 # vim:set ts=4 et ft=sh:
 
-source /etc/conf.d/tiny-cloud
 source /lib/tiny-cloud/init-common
 
 expand_root() {
diff --git a/lib/tiny-cloud/init-final b/lib/tiny-cloud/init-final
index 222e19a..f4cd70c 100644
--- a/lib/tiny-cloud/init-final
+++ b/lib/tiny-cloud/init-final
@@ -1,7 +1,6 @@
 # Tiny Cloud - Final Phase Functions
 # vim:set ts=4 et ft=sh:
 
-source /etc/conf.d/tiny-cloud
 source /lib/tiny-cloud/init-common
 
 save_userdata() {
diff --git a/lib/tiny-cloud/init-main b/lib/tiny-cloud/init-main
index 8bbc6dd..96aaf27 100644
--- a/lib/tiny-cloud/init-main
+++ b/lib/tiny-cloud/init-main
@@ -1,7 +1,6 @@
 # Tiny Cloud - Main Phase Functions
 # vim:set ts=4 et ft=sh:
 
-source /etc/conf.d/tiny-cloud
 source /lib/tiny-cloud/init-common
 
 # ensure existence of output directories