diff --git a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833-pinctrl.dtsi b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833-pinctrl.dtsi
index 7f7462e..2209ca3 100644
--- a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833-pinctrl.dtsi
+++ b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833-pinctrl.dtsi
@@ -45,4 +45,4 @@
 			low-power-enable;
 		};
 	};
-};
\ No newline at end of file
+};
diff --git a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833_1_1_0.conf b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833_1_1_0.conf
index b51f120..c1f719c 100644
--- a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833_1_1_0.conf
+++ b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833_1_1_0.conf
@@ -1,2 +1 @@
-
-CONFIG_BOARD_REVISION="1.1.0"
\ No newline at end of file
+CONFIG_BOARD_REVISION="1.1.0"
diff --git a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833_1_1_0.overlay b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833_1_1_0.overlay
index dc1a9da..4b46ce2 100644
--- a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833_1_1_0.overlay
+++ b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833_1_1_0.overlay
@@ -27,4 +27,4 @@
 		zephyr,input-positive = <NRF_SAADC_AIN0>;
 		zephyr,resolution = <10>;
 	};
-};
\ No newline at end of file
+};
diff --git a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833_1_2_0.conf b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833_1_2_0.conf
index e4fd3a4..9daf8a6 100644
--- a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833_1_2_0.conf
+++ b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833_1_2_0.conf
@@ -1,2 +1 @@
-
-CONFIG_BOARD_REVISION="1.2.0"
\ No newline at end of file
+CONFIG_BOARD_REVISION="1.2.0"
diff --git a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833_1_2_0.overlay b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833_1_2_0.overlay
index cebbe1d..66739c6 100644
--- a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833_1_2_0.overlay
+++ b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833_1_2_0.overlay
@@ -26,4 +26,4 @@
 		zephyr,input-positive = <NRF_SAADC_AIN0>;
 		zephyr,resolution = <10>;
 	};
-};
\ No newline at end of file
+};
diff --git a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833_2_0_0.conf b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833_2_0_0.conf
index f3c9fed..2dc67c8 100644
--- a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833_2_0_0.conf
+++ b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833_2_0_0.conf
@@ -1 +1 @@
-CONFIG_BOARD_REVISION="2.0.0"
\ No newline at end of file
+CONFIG_BOARD_REVISION="2.0.0"
diff --git a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833_2_0_0.overlay b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833_2_0_0.overlay
index d70d2e4..9621c65 100644
--- a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833_2_0_0.overlay
+++ b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833_2_0_0.overlay
@@ -32,4 +32,4 @@
 		zephyr,input-positive = <NRF_SAADC_AIN0>;
 		zephyr,resolution = <10>;
 	};
-};
\ No newline at end of file
+};
diff --git a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840_1_1_0.conf b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840_1_1_0.conf
index f7e2ab9..c1f719c 100644
--- a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840_1_1_0.conf
+++ b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840_1_1_0.conf
@@ -1 +1 @@
-CONFIG_BOARD_REVISION="1.1.0"
\ No newline at end of file
+CONFIG_BOARD_REVISION="1.1.0"
diff --git a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840_1_2_0.conf b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840_1_2_0.conf
index 5cd66ec..9daf8a6 100644
--- a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840_1_2_0.conf
+++ b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840_1_2_0.conf
@@ -1 +1 @@
-CONFIG_BOARD_REVISION="1.2.0"
\ No newline at end of file
+CONFIG_BOARD_REVISION="1.2.0"
diff --git a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840_2_0_0.conf b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840_2_0_0.conf
index f3c9fed..2dc67c8 100644
--- a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840_2_0_0.conf
+++ b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840_2_0_0.conf
@@ -1 +1 @@
-CONFIG_BOARD_REVISION="2.0.0"
\ No newline at end of file
+CONFIG_BOARD_REVISION="2.0.0"
diff --git a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840_2_0_0.overlay b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840_2_0_0.overlay
index d70d2e4..9621c65 100644
--- a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840_2_0_0.overlay
+++ b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840_2_0_0.overlay
@@ -32,4 +32,4 @@
 		zephyr,input-positive = <NRF_SAADC_AIN0>;
 		zephyr,resolution = <10>;
 	};
-};
\ No newline at end of file
+};
diff --git a/code/nrf-connect/prstlib/include/prstlib/button.h b/code/nrf-connect/prstlib/include/prstlib/button.h
index a6a7c06..8d65c80 100644
--- a/code/nrf-connect/prstlib/include/prstlib/button.h
+++ b/code/nrf-connect/prstlib/include/prstlib/button.h
@@ -21,4 +21,4 @@ int prst_button_register_callback(prst_button_callback_t callback);
 // -1 on error
 int prst_button_poll(prst_button_t prst_button);
 
-#endif  // _PRST_BUTTON_H_
\ No newline at end of file
+#endif  // _PRST_BUTTON_H_
diff --git a/code/nrf-connect/prstlib/src/button.c b/code/nrf-connect/prstlib/src/button.c
index eca4510..5a99c25 100644
--- a/code/nrf-connect/prstlib/src/button.c
+++ b/code/nrf-connect/prstlib/src/button.c
@@ -65,4 +65,4 @@ int prst_button_register_callback(prst_button_callback_t callback) {
 int prst_button_poll(prst_button_t prst_button) {
   RET_CHECK(prst_button == PRST_BUTTON_SW1, "Invalid button");
   return gpio_pin_get_dt(&button);
-}
\ No newline at end of file
+}
diff --git a/code/nrf-connect/samples/ble/ble.code-workspace b/code/nrf-connect/samples/ble/ble.code-workspace
index 4e759b6..42d0580 100644
--- a/code/nrf-connect/samples/ble/ble.code-workspace
+++ b/code/nrf-connect/samples/ble/ble.code-workspace
@@ -11,8 +11,6 @@
 		"C_Cpp.autoAddFileAssociations": false,
 		"nrf-connect.applications": [
 			"${workspaceFolder}"
-		],
-		"nrf-connect.toolchain.path": "${nrf-connect.toolchain:2.2.0}",
-		"nrf-connect.topdir": "${nrf-connect.sdk:2.2.0}"
+		]
 	}
-}
\ No newline at end of file
+}
diff --git a/code/nrf-connect/samples/ble/prj.conf b/code/nrf-connect/samples/ble/prj.conf
index d6506f3..fe96f3b 100644
--- a/code/nrf-connect/samples/ble/prj.conf
+++ b/code/nrf-connect/samples/ble/prj.conf
@@ -20,7 +20,7 @@ CONFIG_NEWLIB_LIBC=y
 CONFIG_NEWLIB_LIBC_FLOAT_PRINTF=y
 
 # Application config - see all options in Kconfig.
-CONFIG_PRST_BLE_ENCODING_BTHOME_V2=y
+# CONFIG_PRST_BLE_ENCODING_BTHOME_V2=y
 # CONFIG_PRST_SLEEP_DURATION_SEC=1
 
 # prstlib config - ser all options in prstlib/Kconfig.
diff --git a/code/nrf-connect/samples/input/src/main.c b/code/nrf-connect/samples/input/src/main.c
index e174229..49ae199 100644
--- a/code/nrf-connect/samples/input/src/main.c
+++ b/code/nrf-connect/samples/input/src/main.c
@@ -1,10 +1,3 @@
-// #include <prstlib/button.h>
-// #include <prstlib/led.h>
-// #include <prstlib/sensors.h>
-// #include <zephyr/logging/log.h>
-// #include <zephyr/pm/device.h>
-// #include <zephyr/pm/pm.h>
-// #include <zephyr/pm/policy.h>
 #include <prstlib/adc.h>
 #include <prstlib/button.h>
 #include <prstlib/led.h>
@@ -13,9 +6,6 @@
 #include <prstlib/shtc3.h>
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
-#include <zephyr/pm/device.h>
-#include <zephyr/pm/pm.h>
-#include <zephyr/pm/policy.h>
 
 LOG_MODULE_REGISTER(main, LOG_LEVEL_DBG);
 
diff --git a/code/nrf-connect/samples/soil_read_loop/soil_read_loop.code-workspace b/code/nrf-connect/samples/soil_read_loop/soil_read_loop.code-workspace
index 4e759b6..42d0580 100644
--- a/code/nrf-connect/samples/soil_read_loop/soil_read_loop.code-workspace
+++ b/code/nrf-connect/samples/soil_read_loop/soil_read_loop.code-workspace
@@ -11,8 +11,6 @@
 		"C_Cpp.autoAddFileAssociations": false,
 		"nrf-connect.applications": [
 			"${workspaceFolder}"
-		],
-		"nrf-connect.toolchain.path": "${nrf-connect.toolchain:2.2.0}",
-		"nrf-connect.topdir": "${nrf-connect.sdk:2.2.0}"
+		]
 	}
-}
\ No newline at end of file
+}