diff --git a/src/Makefile.am b/src/Makefile.am
index 26eb7f636912e69b369476ecb30eda565b1362b8..6ed3528f29fa2203519202f9794b0660db471cc7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,3 @@
-
 # This file is part of SWIFT.
 # Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
 #                    Matthieu Schaller (matthieu.schaller@durham.ac.uk).
@@ -17,10 +16,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Add the debug flag to the whole thing
-AM_CFLAGS = -DTIMER -DCOUNTER $(HDF5_CPPFLAGS)
+AM_CFLAGS = -DTIMER $(HDF5_CPPFLAGS)
 
 # Assign a "safe" version number
-AM_LDFLAGS = $(LAPACK_LIBS) $(BLAS_LIBS) $(HDF5_LDFLAGS) -version-info 0:0:0 # -fsanitize=address
+AM_LDFLAGS = $(HDF5_LDFLAGS) -version-info 0:0:0
 
 # The git command, if available.
 GIT_CMD = @GIT_CMD@
diff --git a/src/queue.c b/src/queue.c
index a62ded2561fc683bf2f44abcf1110b0fb7eebd0c..ab414bba72b71edf76cd2c0a316ad52d6fee9044 100644
--- a/src/queue.c
+++ b/src/queue.c
@@ -38,16 +38,6 @@
 #include "const.h"
 #include "error.h"
 
-/* Counter macros. */
-#ifdef COUNTER
-#define COUNT(c) (__sync_add_and_fetch(&queue_counter[c], 1))
-#else
-#define COUNT(c)
-#endif
-
-/* The counters. */
-int queue_counter[queue_counter_count];
-
 /**
  * @brief Enqueue all tasks in the incoming DEQ.
  *