diff --git a/docs/schema.sql b/docs/schema.sql
index 52f428bf1..80a2054f9 100644
--- a/docs/schema.sql
+++ b/docs/schema.sql
@@ -394,39 +394,6 @@ ALTER TABLE public.circuits_provider_id_seq OWNER TO django;
 ALTER SEQUENCE circuits_provider_id_seq OWNED BY circuits_provider.id;
 
 
---
--- Name: corsheaders_corsmodel; Type: TABLE; Schema: public; Owner: django; Tablespace: 
---
-
-CREATE TABLE corsheaders_corsmodel (
-    id integer NOT NULL,
-    cors character varying(255) NOT NULL
-);
-
-
-ALTER TABLE public.corsheaders_corsmodel OWNER TO django;
-
---
--- Name: corsheaders_corsmodel_id_seq; Type: SEQUENCE; Schema: public; Owner: django
---
-
-CREATE SEQUENCE corsheaders_corsmodel_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
-ALTER TABLE public.corsheaders_corsmodel_id_seq OWNER TO django;
-
---
--- Name: corsheaders_corsmodel_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: django
---
-
-ALTER SEQUENCE corsheaders_corsmodel_id_seq OWNED BY corsheaders_corsmodel.id;
-
-
 --
 -- Name: dcim_consoleport; Type: TABLE; Schema: public; Owner: django; Tablespace: 
 --
@@ -2031,13 +1998,6 @@ ALTER TABLE ONLY circuits_circuittype ALTER COLUMN id SET DEFAULT nextval('circu
 ALTER TABLE ONLY circuits_provider ALTER COLUMN id SET DEFAULT nextval('circuits_provider_id_seq'::regclass);
 
 
---
--- Name: id; Type: DEFAULT; Schema: public; Owner: django
---
-
-ALTER TABLE ONLY corsheaders_corsmodel ALTER COLUMN id SET DEFAULT nextval('corsheaders_corsmodel_id_seq'::regclass);
-
-
 --
 -- Name: id; Type: DEFAULT; Schema: public; Owner: django
 --
@@ -2508,14 +2468,6 @@ ALTER TABLE ONLY circuits_provider
     ADD CONSTRAINT circuits_provider_slug_key UNIQUE (slug);
 
 
---
--- Name: corsheaders_corsmodel_pkey; Type: CONSTRAINT; Schema: public; Owner: django; Tablespace: 
---
-
-ALTER TABLE ONLY corsheaders_corsmodel
-    ADD CONSTRAINT corsheaders_corsmodel_pkey PRIMARY KEY (id);
-
-
 --
 -- Name: dcim_consoleport_cs_port_id_key; Type: CONSTRAINT; Schema: public; Owner: django; Tablespace: 
 --
diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index 1127cde18..072635b6b 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -1,16 +1,3 @@
-"""
-Django settings for netbox project.
-
-Generated by 'django-admin startproject' using Django 1.8.2.
-
-For more information on this file, see
-https://docs.djangoproject.com/en/1.8/topics/settings/
-
-For the full list of settings and their values, see
-https://docs.djangoproject.com/en/1.8/ref/settings/
-"""
-
-# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import os
 import socket
 
@@ -24,7 +11,6 @@ INSTALLED_APPS = (
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'corsheaders',
     'debug_toolbar',
     'django_extensions',
     'django_tables2',
@@ -41,7 +27,6 @@ INSTALLED_APPS = (
 
 MIDDLEWARE_CLASSES = (
     'django.contrib.sessions.middleware.SessionMiddleware',
-    'corsheaders.middleware.CorsMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
@@ -130,11 +115,3 @@ try:
     from configuration import *
 except ImportError:
     pass
-
-# django-cors-headers (API Cross-Origin Resource Sharing)
-if DEBUG:
-    CORS_ORIGIN_ALLOW_ALL = True
-CORS_ALLOW_METHODS = (
-    'GET',
-    'OPTIONS',
-)
diff --git a/requirements.txt b/requirements.txt
index 0c9ff5391..d7db98070 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,4 @@
 Django==1.9.1
-django-cors-headers==1.1.0
 django-debug-toolbar==1.4
 django-extensions==1.6.1
 django-filter==0.12.0