diff --git a/.gitignore b/.gitignore
index c962f72bc..9ffa4a032 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,7 +40,6 @@ python/gribapi_swig.pyc
 # Generated stuff from builds
 src/.libs/
 tools/.libs/
-tools/all_keys
 tools/big2gribex
 tools/gaussian
 tools/gg_sub_area_check
@@ -51,7 +50,6 @@ tools/grib_count
 tools/bufr_count
 tools/codes_count
 tools/codes_bufr_filter
-tools/grib_diff
 tools/grib_dump
 tools/grib_filter
 tools/grib_get
diff --git a/src/Makefile.am b/src/Makefile.am
index 8bcfbe265..d287e31dd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -71,6 +71,7 @@ libeccodes_la_prototypes= \
 	grib_accessor_class_bufr_string_values.c \
 	grib_accessor_class_pack_bufr_values.c \
 	grib_accessor_class_bufr_extract_area_subsets.c \
+	grib_accessor_class_bufr_extract_datetime_subsets.c \
 	grib_accessor_class_group.c \
 	grib_accessor_class_unpack_bufr_values.c \
 	grib_accessor_class_bufr_has_delayed_replication.c \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 76b0d169d..96642e4d1 100755
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -53,7 +53,7 @@ TESTS = definitions.sh \
         padding.sh \
         lamb_az_eq_area.sh \
         grib_to_netcdf.sh \
-        debug.sh \
+        grib_dump_debug.sh \
         jpeg.sh \
         ccsds.sh \
         md5.sh \
diff --git a/tools/Makefile.am b/tools/Makefile.am
index b92d617d4..dbc494a3f 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -22,7 +22,7 @@ bin_PROGRAMS = grib_histogram big2gribex \
                gts_copy gts_dump gts_filter gts_ls \
 							 metar_dump metar_ls
 
-noinst_PROGRAMS =  gaussian grib_diff mars_request xref all_keys #compile #dumpload grib_compare_old
+noinst_PROGRAMS =  gaussian mars_request xref #compile #dumpload grib_compare_old
 
 #test_SOURCES   =  test.c
 
@@ -38,7 +38,6 @@ codes_count_SOURCES           =  codes_count.c
 grib_histogram_SOURCES        =  grib_histogram.c
 codes_parser_SOURCES          =  codes_parser.c
 grib_list_keys_SOURCES        =  list_keys.c
-all_keys_SOURCES              =  all_keys.c
 grib2ppm_SOURCES              =  grib2ppm.c
 codes_info_SOURCES            =  codes_info.c
 grib_ls_SOURCES               =  grib_ls.c
@@ -49,7 +48,6 @@ grib_set_SOURCES              =  grib_set.c
 grib_index_build_SOURCES      =  grib_index_build.c
 grib_get_SOURCES              =  grib_get.c
 grib_get_data_SOURCES         =  grib_get_data.c
-grib_diff_SOURCES             =  grib_diff.c
 grib_compare_SOURCES          =  grib_compare.c 
 big2gribex_SOURCES            =  big2gribex.c
 mars_request_SOURCES          =  mars_request.c
diff --git a/tools/grib_debug.dox b/tools/deprecated/grib_debug.dox
similarity index 100%
rename from tools/grib_debug.dox
rename to tools/deprecated/grib_debug.dox