diff --git a/common/Makefile.am b/common/Makefile.am
index 218cbde8e9a1ab40e9b1996ff4ef67c6f2daf55a..619bb86e12a2cc2d6abb8b794a2721e810ff1001 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -14,7 +14,7 @@ commoninclude_HEADERS = dlist.cc stdstreams.cc alignment.hh \
   array.hh arraylist.hh bitfield.hh debugstream.hh dlist.hh \
   enumset.hh exceptions.hh fixedarray.hh fmatrix.hh \
   fvector.hh genericiterator.hh \
-  helpertemplates.hh interfaces.hh iteratorfacades.hh logictraits.hh \
+  helpertemplates.hh interfaces.hh iteratorfacades.hh \
   misc.hh poolallocator.hh \
   sllist.hh smartpointer.hh stack.hh stdstreams.hh timer.hh tuples.hh \
   typetraits.hh precision.hh bigunsignedint.hh \
diff --git a/common/logictraits.hh b/common/logictraits.hh
deleted file mode 100644
index b6d8e9bc7791e7b3cff125acb89f8b240a894b22..0000000000000000000000000000000000000000
--- a/common/logictraits.hh
+++ /dev/null
@@ -1,26 +0,0 @@
-// -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-// vi: set et ts=4 sw=2 sts=2:
-// $ Id $
-#ifndef DUNE_LOCICTRAITS_H
-#define DUNE_LOCICTRAITS_H
-
-namespace Dune {
-  /** @addtogroup Common
-   *
-   * @{
-   */
-  template<bool T1, bool T2>
-  struct And
-  {
-    const static bool value=T1 && T2;
-  };
-
-  template<bool T1, bool T2>
-  struct Or
-  {
-    const static bool value=T1 || T2;
-  };
-
-  /** @} */
-}
-#endif
diff --git a/common/test/parsetest.cc b/common/test/parsetest.cc
index 4265b516e26cc27cc2d04ae140015d81d660092b..cf7dafda35e2706c76882c9bf1153cd9907619dd 100644
--- a/common/test/parsetest.cc
+++ b/common/test/parsetest.cc
@@ -32,7 +32,6 @@
 #include <dune/common/interfaces.hh>
 #include <dune/common/iteratorfacades.hh>
 #include <dune/common/lcm.hh>
-#include <dune/common/logictraits.hh>
 #include <dune/common/misc.hh>
 #include <dune/common/poolallocator.hh>
 #include <dune/common/precision.hh>
diff --git a/common/typetraits.hh b/common/typetraits.hh
index 9ee52b04d790ffcc696e7770b820cc9f2cc2527a..b95e2233f61c9b6369f4615c9c5f9cab857e6d78 100644
--- a/common/typetraits.hh
+++ b/common/typetraits.hh
@@ -3,8 +3,6 @@
 #ifndef DUNE_TYPETRAITS_HH
 #define DUNE_TYPETRAITS_HH
 
-#include <dune/common/logictraits.hh>
-
 #ifdef HAVE_TR1_TYPE_TRAITS
 #include <tr1/type_traits>
 #endif
@@ -245,8 +243,7 @@ namespace Dune
        * @brief True if either a conversion from T1 to T2 or vice versa
        * exists.
        */
-      value=Or<Conversion<T1,T2>::exists,
-          Conversion<T2,T1>::exists>::value
+      value = Conversion<T1,T2>::exists || Conversion<T2,T1>::exists
     };
   };