diff --git a/bench1/Jamfile b/bench1/Jamfile
deleted file mode 100644
index 02d4fc9a..00000000
--- a/bench1/Jamfile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-#   Copyright (c) 2000-2002
-#   Joerg Walter, Mathias Koch
-#
-#   Permission to use, copy, modify, distribute and sell this software
-#   and its documentation for any purpose is hereby granted without fee,
-#   provided that the above copyright notice appear in all copies and
-#   that both that copyright notice and this permission notice appear
-#   in supporting documentation.  The authors make no representations
-#   about the suitability of this software for any purpose.
-#   It is provided "as is" without express or implied warranty.
-#
-#   The authors gratefully acknowledge the support of
-#   GeNeSys mbH & Co. KG in producing this work.
-#
-
-subproject libs/numeric/ublas/bench1 ;
-
-SOURCES = bench1 bench11 bench12 bench13 ;
-
-exe bench1
-    : $(SOURCES).cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-#      <gcc><release><cxxflags>"-s -static -fomit-frame-pointer -fexpensive-optimizations -funroll-loops -malign-double -fschedule-insns2 -march=pentium4 -msse -mfpmath=sse -finline-functions -finline-limit=2048"
-#      <gcc><*><cxxflags>"-fabi-version=0"
-      <intel-linux><release><cxxflags>"-Xc"
-      <intel-linux><release><cxxflags>"-unroll -march=pentium4 -Zp16"
-    ;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/bench2/Jamfile b/bench2/Jamfile
deleted file mode 100644
index da2d61bd..00000000
--- a/bench2/Jamfile
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-#   Copyright (c) 2000-2002
-#   Joerg Walter, Mathias Koch
-#
-#   Permission to use, copy, modify, distribute and sell this software
-#   and its documentation for any purpose is hereby granted without fee,
-#   provided that the above copyright notice appear in all copies and
-#   that both that copyright notice and this permission notice appear
-#   in supporting documentation.  The authors make no representations
-#   about the suitability of this software for any purpose.
-#   It is provided "as is" without express or implied warranty.
-#
-#   The authors gratefully acknowledge the support of
-#   GeNeSys mbH & Co. KG in producing this work.
-#
-
-subproject libs/numeric/ublas/bench2 ;
-
-SOURCES = bench2 bench21 bench22 bench23 ;
-
-exe bench2
-    : $(SOURCES).cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-#      <gcc><*><cxxflags>"-fabi-version=0"
-      <intel-linux><*><cxxflags>"-Xc"
-    ;
-
diff --git a/bench3/Jamfile b/bench3/Jamfile
deleted file mode 100644
index bb5750c4..00000000
--- a/bench3/Jamfile
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-#   Copyright (c) 2000-2002
-#   Joerg Walter, Mathias Koch
-#
-#   Permission to use, copy, modify, distribute and sell this software
-#   and its documentation for any purpose is hereby granted without fee,
-#   provided that the above copyright notice appear in all copies and
-#   that both that copyright notice and this permission notice appear
-#   in supporting documentation.  The authors make no representations
-#   about the suitability of this software for any purpose.
-#   It is provided "as is" without express or implied warranty.
-#
-#   The authors gratefully acknowledge the support of
-#   GeNeSys mbH & Co. KG in producing this work.
-#
-
-subproject libs/numeric/ublas/bench3 ;
-
-SOURCES = bench3 bench31 bench32 bench33 ;
-
-exe bench3
-    : $(SOURCES).cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-#      <gcc><*><cxxflags>"-fabi-version=0"
-      <intel-linux><*><cxxflags>"-Xc"
-    ;
-
-
diff --git a/bench4/Jamfile b/bench4/Jamfile
deleted file mode 100644
index 7e44ae3d..00000000
--- a/bench4/Jamfile
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-#   Copyright (c) 2000-2002
-#   Joerg Walter, Mathias Koch
-#
-#   Permission to use, copy, modify, distribute and sell this software
-#   and its documentation for any purpose is hereby granted without fee,
-#   provided that the above copyright notice appear in all copies and
-#   that both that copyright notice and this permission notice appear
-#   in supporting documentation.  The authors make no representations
-#   about the suitability of this software for any purpose.
-#   It is provided "as is" without express or implied warranty.
-#
-#   The authors gratefully acknowledge the support of
-#   GeNeSys mbH & Co. KG in producing this work.
-#
-
-subproject libs/numeric/ublas/bench4 ;
-
-SOURCES = bench4 bench41 bench42 bench43 ;
-
-exe bench4
-    : $(SOURCES).cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <define>BOOST_UBLAS_USE_INTERVAL
-#      <gcc><*><cxxflags>"-fabi-version=0"
-      <intel-linux><*><cxxflags>"-Xc"
-    ;
-
-
diff --git a/doc/samples/Jamfile b/doc/samples/Jamfile
deleted file mode 100644
index 7da70284..00000000
--- a/doc/samples/Jamfile
+++ /dev/null
@@ -1,433 +0,0 @@
-#
-#   Copyright (c) 2000-2002
-#   Joerg Walter, Mathias Koch
-#
-#   Permission to use, copy, modify, distribute and sell this software
-#   and its documentation for any purpose is hereby granted without fee,
-#   provided that the above copyright notice appear in all copies and
-#   that both that copyright notice and this permission notice appear
-#   in supporting documentation.  The authors make no representations
-#   about the suitability of this software for any purpose.
-#   It is provided "as is" without express or implied warranty.
-#
-#   The authors gratefully acknowledge the support of
-#   GeNeSys mbH & Co. KG in producing this work.
-#
-
-subproject libs/numeric/ublas/doc/samples ;
-
-exe unbounded_array
-    : unbounded_array.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe bounded_array
-    : bounded_array.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe range
-    : range.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe slice
-    : slice.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe map_array
-    : map_array.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe vector
-    : vector.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe unit_vector
-    : unit_vector.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe zero_vector
-    : zero_vector.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe mapped_vector
-    : mapped_vector.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe compressed_vector
-    : compressed_vector.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe coordinate_vector
-    : coordinate_vector.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe vector_range
-    : vector_range.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe vector_range_project
-    : vector_range_project.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe vector_slice
-    : vector_slice.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe vector_slice_project
-    : vector_slice_project.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe vector_unary
-    : vector_unary.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe vector_binary
-    : vector_binary.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe vector_binary_outer
-    : vector_binary_outer.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe vector_binary_scalar
-    : vector_binary_scalar.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe vector_unary_redux
-    : vector_unary_redux.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe vector_binary_redux
-    : vector_binary_redux.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe matrix
-    : matrix.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe identity_matrix
-    : identity_matrix.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe zero_matrix
-    : zero_matrix.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe mapped_matrix
-    : mapped_matrix.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe compressed_matrix
-    : compressed_matrix.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe coordinate_matrix
-    : coordinate_matrix.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe matrix_row
-    : matrix_row.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe matrix_row_project
-    : matrix_row_project.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe matrix_column
-    : matrix_column.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe matrix_column_project
-    : matrix_column_project.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe matrix_vector_range
-    : matrix_vector_range.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe matrix_vector_slice
-    : matrix_vector_slice.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe matrix_range
-    : matrix_range.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe matrix_range_project
-    : matrix_range_project.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe matrix_slice
-    : matrix_slice.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe matrix_slice_project
-    : matrix_slice_project.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe matrix_unary
-    : matrix_unary.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe matrix_binary
-    : matrix_binary.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe matrix_binary_scalar
-    : matrix_binary_scalar.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe matrix_vector_binary
-    : matrix_vector_binary.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe matrix_vector_solve
-    : matrix_vector_solve.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe matrix_matrix_binary
-    : matrix_matrix_binary.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe matrix_matrix_solve
-    : matrix_matrix_solve.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe banded_matrix
-    : banded_matrix.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe banded_adaptor
-    : banded_adaptor.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe hermitian_matrix
-    : hermitian_matrix.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe hermitian_adaptor
-    : hermitian_adaptor.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe symmetric_matrix
-    : symmetric_matrix.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe symmetric_adaptor
-    : symmetric_adaptor.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe triangular_matrix
-    : triangular_matrix.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
-
-exe triangular_adaptor
-    : triangular_adaptor.cpp
-    : <include>$(BOOST_ROOT)
-      <sysinclude>$(BOOST_ROOT)
-      <borland><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-      <kylix><*><cxxflags>"-w-8026 -w-8027 -w-8057 -w-8084 -w-8092"
-    ;
diff --git a/test/Jamfile b/test/Jamfile
deleted file mode 100644
index ea55bffe..00000000
--- a/test/Jamfile
+++ /dev/null
@@ -1,128 +0,0 @@
-#
-#   Copyright (c) 2000-2002
-#   Joerg Walter, Mathias Koch
-#
-#   Permission to use, copy, modify, distribute and sell this software
-#   and its documentation for any purpose is hereby granted without fee,
-#   provided that the above copyright notice appear in all copies and
-#   that both that copyright notice and this permission notice appear
-#   in supporting documentation.  The authors make no representations
-#   about the suitability of this software for any purpose.
-#   It is provided "as is" without express or implied warranty.
-#
-#   The authors gratefully acknowledge the support of
-#   GeNeSys mbH & Co. KG in producing this work.
-#
-
-subproject libs/numeric/ublas/test ;
-# bring in rules for testing
-import testing ;
-
-# Define features to test:
-#  Value types: USE_FLOAT USE_DOUBLE USE_STD_COMPLEX
-#  Proxies: USE_RANGE USE_SLICE
-#  Storage types: USE_BOUNDED_ARRAY USE_UNBOUNDED_ARRAY
-#  Vector types: USE_STD_VECTOR USE_BOUNDED_VECTOR
-#  Matrix types: USE_MATRIX USE_BOUNDED_MATRIX USE_VECTOR_OF_VECTOR
-#  Adaptors: USE_ADAPTOR
-
-UBLAS_TESTSET ?=
-            USE_DOUBLE USE_STD_COMPLEX
-            USE_RANGE USE_SLICE
-            USE_UNBOUNDED_ARRAY USE_BOUNDED_VECTOR USE_MATRIX ;
-
-#  Sparse storage: USE_MAP_ARRAY USE_STD_MAP
-#  Sparse vectors: USE_MAPPED_VECTOR USE_COMPRESSED_VECTOR USE_COORDINATE_VECTOR
-#  Sparse matrices: USE_MAPPED_MATRIX USE_COMPRESSED_MATRIX USE_COORDINATE_MATRIX USE_MAPPED_VECTOR_OF_MAPPED_VECTOR USE_GENERALIZED_VECTOR_OF_VECTOR
-
-UBLAS_TESTSET_SPARSE ?= 
-            USE_DOUBLE USE_STD_COMPLEX
-#            USE_RANGE USE_SLICE    Too complex for regression testing
-            USE_UNBOUNDED_ARRAY
-            USE_STD_MAP
-            USE_MAPPED_VECTOR USE_COMPRESSED_VECTOR USE_COORDINATE_VECTOR
-            USE_MAPPED_MATRIX USE_COMPRESSED_MATRIX USE_COORDINATE_MATRIX ;
-
-
-test-suite numeric/uBLAS
-    : [ run test1.cpp
-            test11.cpp
-            test12.cpp
-            test13.cpp
-        : # args
-        : # input files
-        : # requirements
-            <define>$(UBLAS_TESTSET)
-            <intel-linux><*><cxxflags>"-fpstkchk"    # Try and pick up runtime failures
-            <vacpp><*><define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
-            [ cond [ is-subset Darwin : $(JAMUNAME) ] : <gcc><*><cxxflags>"-fabi-version=0" ] ]
-      [ run test2.cpp
-            test21.cpp
-            test22.cpp
-            test23.cpp
-        : # args
-        : # input files
-        : # requirements
-            <define>$(UBLAS_TESTSET)
-            <vacpp><*><define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
-      ]
-      [ run test3.cpp
-            test31.cpp
-            test32.cpp
-            test33.cpp
-        : # args
-        : # input files
-        : # requirements
-            <define>$(UBLAS_TESTSET_SPARSE)
-            <vacpp><*><define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
-      ]
-      [ run test4.cpp
-            test42.cpp
-            test43.cpp
-        : # args
-        : # input files
-        : # requirements
-            <define>$(UBLAS_TESTSET)
-            <vacpp><*><define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
-      ]
-      [ run test5.cpp
-            test52.cpp
-            test53.cpp
-        : # args
-        : # input files
-        : # requirements
-            <define>$(UBLAS_TESTSET)
-            <vacpp><*><define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
-      ]
-      [ run test6.cpp
-            test62.cpp
-            test63.cpp
-        : # args
-        : # input files
-        : # requirements
-            <define>$(UBLAS_TESTSET)
-            <vacpp><*><define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
-      ]
-# Test7 checks uBLAS operation with interval types.
-# This causes too much compiler badness. Issues need to be addressed for VC7.1 VC8 CW9 and Intel 8 (windows)
-#      [ run test7.cpp
-#            test71.cpp
-#            test72.cpp
-#            test73.cpp
-#        : # args
-#        : # input files
-#        : # requirements
-#            <define>BOOST_UBLAS_USE_INTERVAL
-#            <define>$(UBLAS_TESTSET)
-#            <vacpp><*><define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
-#      ]
-
-      [ run placement_new.cpp
-      ]
-      [ compile concepts.cpp
-        : # requirements
-            <define>EXTERNAL
-            <intel-linux><*><cxxflags>"-Xc"
-            <vacpp><*><define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
-      ]
-    ;