diff --git a/interfaces/Makefile.am b/interfaces/Makefile.am
index 3b351af8fea32045a6e01f97623e7dd36cbb7598..4dcc694f43d92514a44b3d2fa4b77d0e2cf65eea 100644
--- a/interfaces/Makefile.am
+++ b/interfaces/Makefile.am
@@ -5,17 +5,13 @@ BINDINGS  =
 CLEANFILES =
 BINDING_TESTS =
 
+EXTRA_DIST = mulval.nc.gz
+
 INTERFACES_FILES = \
 	$(abs_top_srcdir)/interfaces/ruby/test.rb \
 	$(abs_top_srcdir)/interfaces/ruby/setup.rb \
 	$(abs_top_srcdir)/interfaces/python/test.py \
-	$(abs_top_srcdir)/interfaces/python/setup.py \
-	$(abs_top_srcdir)/interfaces/python/table.py \
-	$(abs_top_srcdir)/interfaces/python/Cdi.py \
-	$(abs_top_srcdir)/interfaces/CdiInfo.cpp \
-	$(abs_top_srcdir)/interfaces/f2003/bindGen.rb
-
-EXTRA_DIST = $(SWIG_FILE) $(INTERFACES_FILES)
+	$(abs_top_srcdir)/interfaces/python/setup.py
 
 MODULE_NAME         = Cdi
 RUBY_WRAPPER_FILE   = $(abs_top_builddir)/interfaces/ruby/cdi_wrapper.cpp
@@ -41,7 +37,7 @@ libcdipp_la_SOURCES = cdi.cpp cdi.hpp
 libcdipp_la_LIBADD  = $(top_builddir)/src/libcdi.la
 libcdipp_la_LDFLAGS = @NETCDF_LIBS@ @SZLIB_LIBS@ $(LDFLAGS)
 
-CdiInfo_SOURCES     = CdiInfo.cpp mulval.grb mulval.nc
+CdiInfo_SOURCES     = CdiInfo.cpp mulval.nc
 CdiInfo_LDADD       = libcdipp.la
 CdiInfo_LDFLAGS     = @NETCDF_LIBS@ @SZLIB_LIBS@ $(LDFLAGS)
 
diff --git a/interfaces/test.rb b/interfaces/test.rb
deleted file mode 100644
index e040bbca909e8b7c58d3661e1543fd8da813b1dc..0000000000000000000000000000000000000000
--- a/interfaces/test.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-require './CdiObj'
-include CdiObj
-require "pp"
-
-ifile = ARGV[0].nil? ? "../testdata/mulval.grb" : ARGV[0]
-
-puts "Reading file: #{ifile}"
-cdi = Cdi.new(ifile);
-
-puts "Stream: #{cdi.streamID} vlistID:#{cdi.vlistID} nvars:#{cdi.nvars}"
-
-puts "#========== TAXES ====================================#"
-cdi.taxes.each {|k,v| 
-  puts k.to_s+": " + cdi.taxes[k].ntsteps.to_s
-}
-puts "#========== GRIDS ====================================#"
-cdi.grids.each {|k,v| 
-  puts [k.to_s+": ",
-        v.size.to_s,
-        v.xname,
-        v.yname,
-        v.ylongname].join(" ")
-}
-
-puts "#========== ZAXES ====================================#"
-cdi.zaxes.each {|k,v|
-  puts [k.to_s+": ",
-        cdi.zaxes[k].size.to_s,
-        cdi.zaxes[k].name,
-        cdi.zaxes[k].units].join(" ")
-}
-
-puts "#========== VARIABLES ================================#"
-cdi.variables.each_with_index {|k,i| 
-  print k.name[0,5] + " " + k.size.to_s + " "
-  puts if i%16==0
-}
-cdi.variables.each_with_index {|k,i| 
-  print k.missval
-  puts if i%16==0
-}
-
-puts "#========== VARNAMES =================================#"
-puts cdi.varnames.sort.join(" ")
-puts cdi.varnames.grep(/max/).join(" <-> ")
-
-puts "#========== VARIABLE.NAME =================================#"
-puts cdi.variables.collect {|v| v.longname }.join("-")
-puts cdi.variables.collect {|v| v.units }.join("-")
-
-puts "#========== VAR by index ======================================#"
-var = cdi.variables[1]
-var.getValues()
-val = var.values
-pp val[-5..-1]
-puts "#========= Var by name ===============================#"
-name ="tsurf"
-newvar = cdi.var[name]
-puts "name ",name," var.name: ", newvar.name, " var.grids.xsize: " , newvar.grid.xsize
-puts "#========= Var by code ===============================#"
-code = 169
-newvar = cdi.varByCode[code]
-newvar.sinfo
diff --git a/src/Makefile.am b/src/Makefile.am
index a8a8dfb89d572af606abe108797c819e21a54d1e..121193f78084c73d15aa8e0bf45c9e038fb3ca83 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 #
-EXTRA_DIST = cdilib.c
+EXTRA_DIST = cdilib.c $(top_srcdir)/interfaces/f2003/bindGen.rb
 
 noinst_LTLIBRARIES = libcdiresunpack.la