diff --git a/CHANGELOG.md b/CHANGELOG.md
index 14fdb34..15d5054 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ### HEAD
+* Remove `lib/post-types.php` and `lib/metaboxes.php`
 * Make sure Primary Navigation menu always gets created and has the location set upon activation, update activation permalink method
 * Update to Bootstrap 2.2.1
 * Update conditional feed method
diff --git a/doc/lib.md b/doc/lib.md
index 833ff69..2982c70 100644
--- a/doc/lib.md
+++ b/doc/lib.md
@@ -50,18 +50,10 @@ This file handles the clean URL rewrites and HTML5 Boilerplate `.htaccess`. [Abo
 
 This file runs the initial theme setup and defines helper constants for later use
 
-### metaboxes.php
-
-This file is a placeholder for you to put in custom metaboxes. We recommend the use of [Custom Metaboxes and Fields for WordPress](https://github.com/jaredatch/Custom-Metaboxes-and-Fields-for-WordPress).
-
 ### nav.php
 
 This file contains all the custom nav modifications (for Bootstrap) and clean up.
 
-### post-types.php
-
-This file is a placeholder for you to put in [custom post types](http://codex.wordpress.org/Function_Reference/register_post_type) and [taxonomies](http://codex.wordpress.org/Function_Reference/register_taxonomy).
-
 ### scripts.php
 
 This file handles all of the CSS and JavaScript.
diff --git a/doc/usage.md b/doc/usage.md
index 5c7fcbb..b87c124 100755
--- a/doc/usage.md
+++ b/doc/usage.md
@@ -34,17 +34,16 @@ A basic Roots theme initially looks like this:
 ├── lang
 │   └── roots.pot
 ├── lib
-│   ├── actions.php
 │   ├── activation.php
 │   ├── cleanup.php
 │   ├── config.php
 │   ├── custom.php
 │   ├── h5bp-htaccess
 │   ├── htaccess.php
-│   ├── metaboxes.php
-│   ├── post-types.php
+│   ├── init.php
+│   ├── nav.php
 │   ├── scripts.php
-│   ├── template-tags.php
+│   ├── sidebar.php
 │   ├── utils.php
 │   └── widgets.php
 ├── templates
@@ -52,6 +51,7 @@ A basic Roots theme initially looks like this:
 │   ├── content.php
 │   ├── content-page.php
 │   ├── content-single.php
+│   ├── entry-meta.php
 │   ├── footer.php
 │   ├── head.php
 │   ├── header.php
diff --git a/functions.php b/functions.php
index 08c0bbf..fd3960c 100644
--- a/functions.php
+++ b/functions.php
@@ -15,6 +15,4 @@ require_once locate_template('/lib/nav.php');             // Custom nav modifica
 require_once locate_template('/lib/htaccess.php');        // Rewrites for assets, H5BP .htaccess
 require_once locate_template('/lib/widgets.php');         // Sidebars and widgets
 require_once locate_template('/lib/scripts.php');         // Scripts and stylesheets
-require_once locate_template('/lib/post-types.php');      // Custom post types
-require_once locate_template('/lib/metaboxes.php');       // Custom metaboxes
 require_once locate_template('/lib/custom.php');          // Custom functions
diff --git a/lib/metaboxes.php b/lib/metaboxes.php
deleted file mode 100644
index eea11e3..0000000
--- a/lib/metaboxes.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-// Custom metaboxes
diff --git a/lib/post-types.php b/lib/post-types.php
deleted file mode 100644
index 6a8972d..0000000
--- a/lib/post-types.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-// Custom post types