diff --git a/include/floating.h b/include/floating.h
index 4af434cf..8e60f78c 100644
--- a/include/floating.h
+++ b/include/floating.h
@@ -32,7 +32,7 @@ void floating_enable(Con *con, bool automatic);
  * to its old parent.
  *
  */
-void floating_disable(Con *con, bool automatic);
+void floating_disable(Con *con);
 
 /**
  * Calls floating_enable() for tiling containers and floating_disable() for
diff --git a/libi3/font.c b/libi3/font.c
index 32744c0b..7b10edf0 100644
--- a/libi3/font.c
+++ b/libi3/font.c
@@ -323,7 +323,7 @@ bool font_is_pango(void) {
 static int predict_text_width_xcb(const xcb_char2b_t *text, size_t text_len);
 
 static void draw_text_xcb(const xcb_char2b_t *text, size_t text_len, xcb_drawable_t drawable,
-                          xcb_gcontext_t gc, int x, int y, int max_width) {
+                          xcb_gcontext_t gc, int x, int y) {
     /* X11 coordinates for fonts start at the baseline */
     int pos_y = y + savedFont->specific.xcb.info->font_ascent;
 
@@ -372,7 +372,7 @@ void draw_text(i3String *text, xcb_drawable_t drawable, xcb_gcontext_t gc,
             return;
         case FONT_TYPE_XCB:
             draw_text_xcb(i3string_as_ucs2(text), i3string_get_num_glyphs(text),
-                          drawable, gc, x, y, max_width);
+                          drawable, gc, x, y);
             break;
         case FONT_TYPE_PANGO:
             /* Render the text using Pango */
diff --git a/src/commands.c b/src/commands.c
index cb2db32f..dec4d7a3 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -426,7 +426,7 @@ static direction_t parse_direction(const char *str) {
     }
 }
 
-static void cmd_resize_floating(I3_CMD, const char *way, const char *direction_str, Con *floating_con, int px) {
+static void cmd_resize_floating(I3_CMD, const char *direction_str, Con *floating_con, int px) {
     Rect old_rect = floating_con->rect;
     Con *focused_con = con_descend_focused(floating_con);
 
@@ -596,7 +596,7 @@ void cmd_resize(I3_CMD, const char *way, const char *direction, long resize_px,
 
         Con *floating_con;
         if ((floating_con = con_inside_floating(current->con))) {
-            cmd_resize_floating(current_match, cmd_output, way, direction, floating_con, resize_px);
+            cmd_resize_floating(current_match, cmd_output, direction, floating_con, resize_px);
         } else {
             if (strcmp(direction, "width") == 0 ||
                 strcmp(direction, "height") == 0) {
@@ -1089,7 +1089,7 @@ void cmd_floating(I3_CMD, const char *floating_mode) {
             if (strcmp(floating_mode, "enable") == 0) {
                 floating_enable(current->con, false);
             } else {
-                floating_disable(current->con, false);
+                floating_disable(current->con);
             }
         }
     }
diff --git a/src/floating.c b/src/floating.c
index d2b3a6ed..69a4f54c 100644
--- a/src/floating.c
+++ b/src/floating.c
@@ -421,7 +421,7 @@ void floating_enable(Con *con, bool automatic) {
     ipc_send_window_event("floating", con);
 }
 
-void floating_disable(Con *con, bool automatic) {
+void floating_disable(Con *con) {
     if (!con_is_floating(con)) {
         LOG("Container isn't floating, not doing anything.\n");
         return;
@@ -469,7 +469,7 @@ void toggle_floating_mode(Con *con, bool automatic) {
     if (con_is_floating(con)) {
         LOG("already floating, re-setting to tiling\n");
 
-        floating_disable(con, automatic);
+        floating_disable(con);
         return;
     }
 
diff --git a/src/move.c b/src/move.c
index 77007c6b..298e1a06 100644
--- a/src/move.c
+++ b/src/move.c
@@ -282,7 +282,7 @@ void tree_move(Con *con, direction_t direction) {
         if (!same_orientation) {
             if (con_is_floating(con)) {
                 /* this is a floating con, we just disable floating */
-                floating_disable(con, true);
+                floating_disable(con);
                 return;
             }
             if (con_inside_floating(con)) {