diff --git a/include/sqlpp11/select.h b/include/sqlpp11/select.h
index 22bd0f24..cf1db690 100644
--- a/include/sqlpp11/select.h
+++ b/include/sqlpp11/select.h
@@ -44,8 +44,6 @@
 #include <sqlpp11/vendor/expression.h>
 #include <sqlpp11/vendor/interpreter.h>
 #include <sqlpp11/vendor/wrong.h>
-#include <sqlpp11/vendor/crtp_wrapper.h>
-#include <sqlpp11/vendor/policy.h>
 #include <sqlpp11/vendor/policy_update.h>
 
 #include <sqlpp11/detail/copy_tuple_args.h>
diff --git a/include/sqlpp11/update.h b/include/sqlpp11/update.h
index 215c5006..63ba4cd5 100644
--- a/include/sqlpp11/update.h
+++ b/include/sqlpp11/update.h
@@ -34,8 +34,6 @@
 #include <sqlpp11/vendor/update_list.h>
 #include <sqlpp11/vendor/noop.h>
 #include <sqlpp11/vendor/where.h>
-#include <sqlpp11/vendor/crtp_wrapper.h>
-#include <sqlpp11/vendor/policy.h>
 #include <sqlpp11/vendor/policy_update.h>
 
 namespace sqlpp
diff --git a/include/sqlpp11/vendor/crtp_wrapper.h b/include/sqlpp11/vendor/crtp_wrapper.h
deleted file mode 100644
index 47ef265a..00000000
--- a/include/sqlpp11/vendor/crtp_wrapper.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2013, Roland Bock
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- * 
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- * 
- *   Redistributions in binary form must reproduce the above copyright notice, this
- *   list of conditions and the following disclaimer in the documentation and/or
- *   other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef SQLPP_VENDOR_CRTP_WRAPPER_H
-#define SQLPP_VENDOR_CRTP_WRAPPER_H
-
-#include <sqlpp11/vendor/wrong.h>
-
-namespace sqlpp
-{
-	namespace vendor
-	{
-		template<typename T>
-			struct get_database_impl;
-
-		template<template<typename, typename...> class Statement, typename Database, typename... Policies>
-			struct get_database_impl<Statement<Database, Policies...>>
-			{
-				using type = Database;
-			};
-
-		template<typename T>
-			using get_database_t = typename get_database_impl<T>::type;
-		
-		template<typename Derived, typename Policy>
-			struct crtp_wrapper_t
-			{
-				static_assert(wrong_t<Derived, Policy>::value, "missing crtp policy specialization");
-			};
-	}
-
-}
-
-#endif
diff --git a/include/sqlpp11/vendor/from.h b/include/sqlpp11/vendor/from.h
index 4211098d..7c513848 100644
--- a/include/sqlpp11/vendor/from.h
+++ b/include/sqlpp11/vendor/from.h
@@ -32,7 +32,6 @@
 #include <sqlpp11/vendor/interpret_tuple.h>
 #include <sqlpp11/detail/logic.h>
 #include <sqlpp11/vendor/policy_update.h>
-#include <sqlpp11/vendor/crtp_wrapper.h>
 
 namespace sqlpp
 {
@@ -82,12 +81,6 @@ namespace sqlpp
 			using _is_noop = std::true_type;
 		};
 
-		// CRTP Wrappers
-		template<typename Derived, typename Database, typename... Args>
-			struct crtp_wrapper_t<Derived, from_t<Database, Args...>>
-			{
-			};
-
 		// Interpreters
 		template<typename Context, typename Database, typename... Tables>
 			struct interpreter_t<Context, from_t<Database, Tables...>>
diff --git a/include/sqlpp11/vendor/group_by.h b/include/sqlpp11/vendor/group_by.h
index 1a0de458..9e405787 100644
--- a/include/sqlpp11/vendor/group_by.h
+++ b/include/sqlpp11/vendor/group_by.h
@@ -33,7 +33,6 @@
 #include <sqlpp11/vendor/interpret_tuple.h>
 #include <sqlpp11/vendor/interpretable_list.h>
 #include <sqlpp11/vendor/policy_update.h>
-#include <sqlpp11/vendor/crtp_wrapper.h>
 #include <sqlpp11/detail/logic.h>
 
 namespace sqlpp
diff --git a/include/sqlpp11/vendor/having.h b/include/sqlpp11/vendor/having.h
index e412e762..ca4e6410 100644
--- a/include/sqlpp11/vendor/having.h
+++ b/include/sqlpp11/vendor/having.h
@@ -32,7 +32,6 @@
 #include <sqlpp11/vendor/interpret_tuple.h>
 #include <sqlpp11/vendor/interpretable_list.h>
 #include <sqlpp11/vendor/policy_update.h>
-#include <sqlpp11/vendor/crtp_wrapper.h>
 #include <sqlpp11/detail/logic.h>
 
 namespace sqlpp
diff --git a/include/sqlpp11/vendor/limit.h b/include/sqlpp11/vendor/limit.h
index f73b36bf..3c4e03c3 100644
--- a/include/sqlpp11/vendor/limit.h
+++ b/include/sqlpp11/vendor/limit.h
@@ -29,7 +29,6 @@
 
 #include <sqlpp11/type_traits.h>
 #include <sqlpp11/vendor/policy_update.h>
-#include <sqlpp11/vendor/crtp_wrapper.h>
 
 namespace sqlpp
 {
diff --git a/include/sqlpp11/vendor/offset.h b/include/sqlpp11/vendor/offset.h
index 18a90c65..f92ff306 100644
--- a/include/sqlpp11/vendor/offset.h
+++ b/include/sqlpp11/vendor/offset.h
@@ -29,7 +29,6 @@
 
 #include <sqlpp11/type_traits.h>
 #include <sqlpp11/vendor/policy_update.h>
-#include <sqlpp11/vendor/crtp_wrapper.h>
 
 namespace sqlpp
 {
diff --git a/include/sqlpp11/vendor/order_by.h b/include/sqlpp11/vendor/order_by.h
index 0233f03b..61eeb7ed 100644
--- a/include/sqlpp11/vendor/order_by.h
+++ b/include/sqlpp11/vendor/order_by.h
@@ -32,7 +32,6 @@
 #include <sqlpp11/vendor/interpret_tuple.h>
 #include <sqlpp11/vendor/interpretable.h>
 #include <sqlpp11/vendor/policy_update.h>
-#include <sqlpp11/vendor/crtp_wrapper.h>
 #include <sqlpp11/detail/logic.h>
 
 namespace sqlpp
diff --git a/include/sqlpp11/vendor/policy.h b/include/sqlpp11/vendor/policy.h
deleted file mode 100644
index 45edeeac..00000000
--- a/include/sqlpp11/vendor/policy.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2013, Roland Bock
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- * 
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- * 
- *   Redistributions in binary form must reproduce the above copyright notice, this
- *   list of conditions and the following disclaimer in the documentation and/or
- *   other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef SQLPP_VENDOR_POLICY_H
-#define SQLPP_VENDOR_POLICY_H
-
-#include <sqlpp11/vendor/wrong.h>
-
-namespace sqlpp
-{
-	namespace vendor
-	{
-		template<typename PolicyImpl>
-			struct policy_t: public PolicyImpl
-		{
-			policy_t()
-			{}
-
-			template<typename Whatever>
-				policy_t(const Whatever&, policy_t policy):
-					PolicyImpl(policy)
-			{}
-
-			template<typename Whatever>
-				policy_t(const Whatever&, PolicyImpl impl):
-					PolicyImpl(impl)
-			{}
-
-			template<typename Derived, typename Whatever>
-				policy_t(Derived derived, const Whatever&):
-					PolicyImpl(derived)
-			{}
-		};
-
-	}
-
-}
-
-#endif
diff --git a/include/sqlpp11/vendor/select_column_list.h b/include/sqlpp11/vendor/select_column_list.h
index 255644b5..7442e313 100644
--- a/include/sqlpp11/vendor/select_column_list.h
+++ b/include/sqlpp11/vendor/select_column_list.h
@@ -37,7 +37,6 @@
 #include <sqlpp11/vendor/named_interpretable.h>
 #include <sqlpp11/vendor/interpret_tuple.h>
 #include <sqlpp11/vendor/policy_update.h>
-#include <sqlpp11/vendor/crtp_wrapper.h>
 #include <sqlpp11/detail/type_set.h>
 
 namespace sqlpp
diff --git a/include/sqlpp11/vendor/select_flag_list.h b/include/sqlpp11/vendor/select_flag_list.h
index fe68a9f7..c999b003 100644
--- a/include/sqlpp11/vendor/select_flag_list.h
+++ b/include/sqlpp11/vendor/select_flag_list.h
@@ -33,7 +33,6 @@
 #include <sqlpp11/detail/type_set.h>
 #include <sqlpp11/vendor/interpret_tuple.h>
 #include <sqlpp11/vendor/policy_update.h>
-#include <sqlpp11/vendor/crtp_wrapper.h>
 
 namespace sqlpp
 {
diff --git a/include/sqlpp11/vendor/using.h b/include/sqlpp11/vendor/using.h
index 49ab7d9d..bb8ef152 100644
--- a/include/sqlpp11/vendor/using.h
+++ b/include/sqlpp11/vendor/using.h
@@ -32,7 +32,6 @@
 #include <sqlpp11/vendor/interpret_tuple.h>
 #include <sqlpp11/detail/type_set.h>
 #include <sqlpp11/vendor/policy_update.h>
-#include <sqlpp11/vendor/crtp_wrapper.h>
 
 namespace sqlpp
 {