diff --git a/keyboards/splitkb/kyria/keymaps/bbaserdem/readme.md b/keyboards/splitkb/kyria/keymaps/bbaserdem/readme.md
index f7f1d8c0b01..6381612978c 100644
--- a/keyboards/splitkb/kyria/keymaps/bbaserdem/readme.md
+++ b/keyboards/splitkb/kyria/keymaps/bbaserdem/readme.md
@@ -1,4 +1,4 @@
-This file contains my Kyria board layout.
+This folder contains my Kyria (`split_3x6_5`) board layout.
 Check out the [user readme](../../../../../users/bbaserdem/readme.md) for more info.
 
 # Kyria
diff --git a/layouts/community/ortho_4x12/bbaserdem/config.h b/layouts/community/ortho_4x12/bbaserdem/config.h
index db58de9acb5..fb3ec1371b0 100755
--- a/layouts/community/ortho_4x12/bbaserdem/config.h
+++ b/layouts/community/ortho_4x12/bbaserdem/config.h
@@ -19,9 +19,8 @@
 // Code pertaining to planck rev6
 #ifdef KEYBOARD_planck_rev6
     // Encoder I use;
-    #ifdef ENCODER_RESOLUTION
-    #undef ENCODER_RESOLUTION
-    #endif
-    #define ENCODER_RESOLUTION 2
-#endif // rev6
-
+#   ifdef ENCODER_RESOLUTION
+#   undef ENCODER_RESOLUTION
+#   endif
+#   define ENCODER_RESOLUTION 2
+#endif
diff --git a/layouts/community/split_3x6_3/bbaserdem/config.h b/layouts/community/split_3x6_3/bbaserdem/config.h
index 34301a64fdd..adf707d1bab 100644
--- a/layouts/community/split_3x6_3/bbaserdem/config.h
+++ b/layouts/community/split_3x6_3/bbaserdem/config.h
@@ -34,16 +34,6 @@
 #   undef USE_I2C
 #   undef SSD1306OLED
 
-    // Add state info transmission
-#   define SPLIT_LAYER_STATE_ENABLE
-#   define SPLIT_MODS_ENABLE
-#   define SPLIT_WPM_ENABLE
-
-    // Add state info transmission
-#   define SPLIT_LAYER_STATE_ENABLE
-#   define SPLIT_MODS_ENABLE
-#   define SPLIT_WPM_ENABLE
-
     // Audio output on pin A5 (actualy will be output on B1 using keymap init)
 #   ifdef AUDIO_ENABLE
 #       define AUDIO_PIN A5
diff --git a/layouts/community/split_3x6_3/bbaserdem/keymap.c b/layouts/community/split_3x6_3/bbaserdem/keymap.c
index af48b414f2c..589b8eda0c8 100644
--- a/layouts/community/split_3x6_3/bbaserdem/keymap.c
+++ b/layouts/community/split_3x6_3/bbaserdem/keymap.c
@@ -21,22 +21,6 @@
 #   include "bb-oled-extra.h"
 #endif // KEYBOARD_crkbd_rev1
 
-#ifdef KEYBOARD_crkbd_rev1
-#   include "bb-oled-extra.h"
-#endif // KEYBOARD_crkbd_rev1
-//
-/* F layout
- * ┌───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┐
- * │+ *│ F │ G │ Ğ │ I │ O │         │ D │ R │ N │ H │ P │ Q │
- * ├───┼───┼───┼───┼───┼───┤         ├───┼───┼───┼───┼───┼───┤
- * │ X │ A │ S │ D │ F │ G │         │ T │ K │ M │ L │ Y │ Ş │
- * ├───┼───┼───┼───┼───┼───┤         ├───┼───┼───┼───┼───┼───┤
- * │< >│ J │ Ö │ V │ C │ Ç │         │ Z │ S │ B │. :│, ;│ W │
- * └───┴───┴───┴───┼───┼───┼───┐ ┌───┼───┼───┼───┴───┴───┴───┘
- *                 │Tab│Ent│Esc│ │Del│Spc│Bsp│
- *                 └───┴───┴───┘ └───┴───┴───┘
- */
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT_split_3x6_3_wrapper(
         BB_ENC0,_BL1_5_,_BR1_5_,BB_ENC1,
@@ -195,15 +179,6 @@ oled_rotation_t oled_init_user(oled_rotation_t rotation) {
     return rotation;
 }
 
-#ifdef OLED_ENABLE
-// Flip the display on the right half
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    if (!is_keyboard_left()) {
-        return OLED_ROTATION_180; 
-    }
-    return rotation;
-}
-
 bool oled_task_keymap(void) {
     if (is_keyboard_left()) {
         render_status_left(0, 0);
diff --git a/users/bbaserdem/bb-encoder.c b/users/bbaserdem/bb-encoder.c
index b654175990c..eea9751051a 100644
--- a/users/bbaserdem/bb-encoder.c
+++ b/users/bbaserdem/bb-encoder.c
@@ -347,8 +347,6 @@ bool process_record_encoder(uint16_t keycode, keyrecord_t *record) {
                     } else {
                         userspace_config.e1point = (userspace_config.e1point + 1) % 4;
                     }
-                    userspace_config.encoder[encoder_index].point =
-                        (userspace_config.encoder[encoder_index].point + 1) % 4;
                     break;
 #               endif // MOUSEKEY_ENABLE
                 default:
diff --git a/users/bbaserdem/bb-oled.c b/users/bbaserdem/bb-oled.c
index 8bd89713540..cf00193c036 100644
--- a/users/bbaserdem/bb-oled.c
+++ b/users/bbaserdem/bb-oled.c
@@ -38,21 +38,6 @@ void oled_task_user(void) {
     }
 }
 
-// Make sure oled sleeps timely
-void housekeeping_task_oled(void) {
-    // If we are not master; sync the oled state
-    /*
-    if (!is_keyboard_master()) {
-        if ((userspace_runtime.oled_on) && (!is_oled_on())) {
-            oled_on();
-        } else if ((!userspace_runtime.oled_on) && (is_oled_on())) {
-            oled_off();
-        }
-    }
-    */
-}
-#endif
-
 /*-------------------------*\
 |*---RENDERING FUNCTIONS---*|
 \*-------------------------*/
@@ -169,7 +154,6 @@ void render_keymap(uint8_t row, uint8_t col, bool isLite) {
         oled_write(" ", false);
     }
 }
-#endif // !KEYBOARD_splitkb_kyria_rev1
 
 // Writes the currently used OLED display layout
 #ifdef RGB_MATRIX_ENABLE
diff --git a/users/bbaserdem/bb-oled.h b/users/bbaserdem/bb-oled.h
index 1bcd49b683b..a355c88ca91 100644
--- a/users/bbaserdem/bb-oled.h
+++ b/users/bbaserdem/bb-oled.h
@@ -15,6 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
+#include "bbaserdem.h"
 
 // Contain the main oled writer here 
 void oled_task_user(void);
diff --git a/users/bbaserdem/config.h b/users/bbaserdem/config.h
index 091166599c3..477378102b3 100644
--- a/users/bbaserdem/config.h
+++ b/users/bbaserdem/config.h
@@ -118,15 +118,6 @@
 #   define OLED_FADE_OUT_INTERVAL 15
 #endif // OLED_ENABLE
 
-// OLED definitions
-#ifdef OLED_ENABLE
-    // Timeout in one minute
-#   define OLED_TIMEOUT 60000
-    // Fade out the screen when timing out
-#   define OLED_FADE_OUT
-#   define OLED_FADE_OUT_INTERVAL 5
-#endif
-
 // For perkey leds
 #ifdef RGB_MATRIX_ENABLE
 // This is not working