diff --git a/src/stdafx.h b/src/stdafx.h
index 3081beafe5..b006c8c471 100644
--- a/src/stdafx.h
+++ b/src/stdafx.h
@@ -285,14 +285,6 @@ char (&ArraySizeHelper(T (&array)[N]))[N];
  */
 #define lengthof(array) (sizeof(ArraySizeHelper(array)))
 
-/**
- * Get the last element of an fixed size array.
- *
- * @param x The pointer to the first element of the array
- * @return The pointer to the last element of the array
- */
-#define lastof(x) (&x[lengthof(x) - 1])
-
 /**
  * Gets the size of a variable within a class.
  * @param base     The class the variable is in.
diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp
index d9494b4fa4..c1aa2ff267 100644
--- a/src/toolbar_gui.cpp
+++ b/src/toolbar_gui.cpp
@@ -1420,7 +1420,7 @@ public:
 		uint spacer_i = 0;
 		uint button_i = 0;
 
-		/* Index into the arrangement indices. The macro lastof cannot be used here! */
+		/* Index into the arrangement indices. */
 		const WidgetID *slotp = rtl ? &arrangement[arrangable_count - 1] : arrangement;
 		for (uint i = 0; i < arrangable_count; i++) {
 			uint slot = lookup[*slotp];