diff --git a/.gitignore b/.gitignore
index 8c870fd2f..c4ae56ddd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,9 +49,6 @@ build/
 # Toolchain
 /toolchain
 
-# automate
-automate.py
-
 # openocd output file
 openocd.log
 
@@ -61,8 +58,8 @@ PVS-Studio.log
 
 .gdbinit
 
-RM*-*.tgz
-RM*-*.zip
-RM*-*.txt
-RM*-*-*/
-PATREONbuildRelease.sh
+
+# XFW-specific:
+
+# Automate files, etc
+automate.py
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index a97e0933a..000000000
--- a/.gitmodules
+++ /dev/null
@@ -1,33 +0,0 @@
-[submodule "lib/mlib"]
-	path = lib/mlib
-	url = https://github.com/P-p-H-d/mlib.git
-[submodule "lib/STM32CubeWB"]
-	path = lib/STM32CubeWB
-	url = https://github.com/Flipper-Zero/STM32CubeWB.git
-[submodule "lib/littlefs"]
-	path = lib/littlefs
-	url = https://github.com/littlefs-project/littlefs.git
-[submodule "lib/nanopb"]
-	path = lib/nanopb
-	url = https://github.com/nanopb/nanopb.git
-[submodule "assets/protobuf"]
-	path = assets/protobuf
-	url = https://github.com/flipperdevices/flipperzero-protobuf.git
-[submodule "lib/libusb_stm32"]
-	path = lib/libusb_stm32
-	url = https://github.com/flipperdevices/libusb_stm32.git
-[submodule "lib/FreeRTOS-Kernel"]
-	path = lib/FreeRTOS-Kernel
-	url = https://github.com/FreeRTOS/FreeRTOS-Kernel.git
-[submodule "lib/microtar"]
-	path = lib/microtar
-	url = https://github.com/amachronic/microtar.git
-[submodule "lib/mbedtls"]
-	path = lib/mbedtls
-	url = https://github.com/Mbed-TLS/mbedtls.git
-[submodule "lib/cxxheaderparser"]
-	path = lib/cxxheaderparser
-	url = https://github.com/robotpy/cxxheaderparser.git
-[submodule "applications/plugins/dap_link/lib/free-dap"]
-	path = applications/plugins/dap_link/lib/free-dap
-	url = https://github.com/ataradov/free-dap.git
diff --git a/assets/dolphin/internal/manifest.txt b/assets/dolphin/internal/manifest.txt
index c42bab84e..ecd3ac5a4 100644
--- a/assets/dolphin/internal/manifest.txt
+++ b/assets/dolphin/internal/manifest.txt
@@ -2,7 +2,7 @@ Filetype: Flipper Animation Manifest
 Version: 1
 
 # Animation 1
-Name: Sasquach_D1g1talRa1n_128x64
+Name: infomercial_128x64
 Min butthurt: 0
 Max butthurt: 14
 Min level: 1
diff --git a/assets/resources/dolphin/manifest.txt b/assets/resources/dolphin/manifest.txt
deleted file mode 100644
index 8067c649d..000000000
--- a/assets/resources/dolphin/manifest.txt
+++ /dev/null
@@ -1,212 +0,0 @@
-Filetype: Flipper Animation Manifest
-Version: 1
-
-Name: lvl_1
-Min butthurt: 0
-Max butthurt: 3
-Min level: 1
-Max level: 30
-Weight: 7
-
-Name: lvl_2
-Min butthurt: 0
-Max butthurt: 3
-Min level: 2
-Max level: 30
-Weight: 7
-
-Name: lvl_3
-Min butthurt: 0
-Max butthurt: 3
-Min level: 3
-Max level: 30
-Weight: 7
-
-Name: lvl_4
-Min butthurt: 0
-Max butthurt: 3
-Min level: 4
-Max level: 30
-Weight: 7
-
-Name: lvl_5
-Min butthurt: 0
-Max butthurt: 3
-Min level: 5
-Max level: 30
-Weight: 7
-
-Name: lvl_6
-Min butthurt: 0
-Max butthurt: 3
-Min level: 6
-Max level: 30
-Weight: 7
-
-Name: lvl_7
-Min butthurt: 0
-Max butthurt: 3
-Min level: 7
-Max level: 30
-Weight: 7
-
-Name: lvl_8
-Min butthurt: 0
-Max butthurt: 3
-Min level: 8
-Max level: 30
-Weight: 7
-
-Name: lvl_9
-Min butthurt: 0
-Max butthurt: 3
-Min level: 9
-Max level: 30
-Weight: 7
-
-Name: lvl_10
-Min butthurt: 0
-Max butthurt: 3
-Min level: 10
-Max level: 30
-Weight: 7
-
-Name: lvl_11
-Min butthurt: 0
-Max butthurt: 3
-Min level: 11
-Max level: 30
-Weight: 7
-
-Name: lvl_12
-Min butthurt: 0
-Max butthurt: 3
-Min level: 12
-Max level: 30
-Weight: 7
-
-Name: lvl_13
-Min butthurt: 0
-Max butthurt: 3
-Min level: 13
-Max level: 30
-Weight: 7
-
-Name: lvl_14
-Min butthurt: 0
-Max butthurt: 3
-Min level: 14
-Max level: 30
-Weight: 7
-
-Name: lvl_15
-Min butthurt: 0
-Max butthurt: 3
-Min level: 15
-Max level: 30
-Weight: 7
-
-Name: lvl_16
-Min butthurt: 0
-Max butthurt: 3
-Min level: 16
-Max level: 30
-Weight: 7
-
-Name: lvl_17
-Min butthurt: 0
-Max butthurt: 3
-Min level: 17
-Max level: 30
-Weight: 7
-
-Name: lvl_18
-Min butthurt: 0
-Max butthurt: 3
-Min level: 18
-Max level: 30
-Weight: 7
-
-Name: lvl_19
-Min butthurt: 0
-Max butthurt: 3
-Min level: 19
-Max level: 30
-Weight: 7
-
-Name: lvl_20
-Min butthurt: 0
-Max butthurt: 3
-Min level: 20
-Max level: 30
-Weight: 7
-
-Name: lvl_21
-Min butthurt: 0
-Max butthurt: 3
-Min level: 21
-Max level: 30
-Weight: 7
-
-Name: lvl_22
-Min butthurt: 0
-Max butthurt: 3
-Min level: 22
-Max level: 30
-Weight: 7
-
-Name: lvl_23
-Min butthurt: 0
-Max butthurt: 3
-Min level: 23
-Max level: 30
-Weight: 7
-
-Name: lvl_24
-Min butthurt: 0
-Max butthurt: 3
-Min level: 24
-Max level: 30
-Weight: 7
-
-Name: lvl_25
-Min butthurt: 0
-Max butthurt: 3
-Min level: 25
-Max level: 30
-Weight: 7
-
-Name: lvl_26
-Min butthurt: 0
-Max butthurt: 3
-Min level: 26
-Max level: 30
-Weight: 7
-
-Name: lvl_27
-Min butthurt: 0
-Max butthurt: 3
-Min level: 27
-Max level: 30
-Weight: 7
-
-Name: lvl_28
-Min butthurt: 0
-Max butthurt: 3
-Min level: 28
-Max level: 30
-Weight: 7
-
-Name: lvl_29
-Min butthurt: 0
-Max butthurt: 3
-Min level: 29
-Max level: 30
-Weight: 7
-
-Name: lvl_30
-Min butthurt: 0
-Max butthurt: 3
-Min level: 30
-Max level: 30
-Weight: 7