diff --git a/models/Address.php b/models/Address.php
deleted file mode 100644
index 3780caf..0000000
--- a/models/Address.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php namespace DShoreman\Shop\Models;
-
-use Model;
-
-/**
- * Address Model
- */
-class Address extends Model
-{
-
-    /**
-     * @var string The database table used by the model.
-     */
-    public $table = 'dshoreman_shop_addresses';
-
-    /**
-     * @var array Guarded fields
-     */
-    protected $guarded = ['*'];
-
-    /**
-     * @var array Fillable fields
-     */
-    protected $fillable = [];
-
-    /**
-     * @var array Relations
-     */
-    public $hasOne = [];
-    public $hasMany = [];
-    public $belongsTo = [];
-    public $belongsToMany = [];
-    public $morphTo = [];
-    public $morphOne = [];
-    public $morphMany = [];
-    public $attachOne = [];
-    public $attachMany = [];
-
-}
\ No newline at end of file
diff --git a/models/address/columns.yaml b/models/address/columns.yaml
deleted file mode 100644
index 6633454..0000000
--- a/models/address/columns.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-# ===================================
-#  List Column Definitions
-# ===================================
-
-columns:
-    id:
-        label: ID
-        searchable: true
-    name:
-        label: Name
-        searchable: true
-    street:
-        label: Street
-        searchable: true
-        invisible: true
-    town:
-        label: Town
-        searchable: true
-    county:
-        label: County
-        searchable: true
-        invisible: true
-    postcode:
-        label: Post Code
-        searchable: true
-    country:
-        label: Country
-        searchable: true
-        invisible: true
diff --git a/models/address/fields.yaml b/models/address/fields.yaml
deleted file mode 100644
index 73a1f9f..0000000
--- a/models/address/fields.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-# ===================================
-#  Form Field Definitions
-# ===================================
-
-fields:
-    id:
-        label: ID
-        disabled: true
-    name:
-        label: Name
-    street:
-        label: Street
-    town:
-        label: Town
-    county:
-        label: County
-    postcode:
-        label: Post Code
-    country:
-        label: Country
diff --git a/updates/create_addresses_table.php b/updates/create_addresses_table.php
deleted file mode 100644
index 7ee3483..0000000
--- a/updates/create_addresses_table.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php namespace DShoreman\Shop\Updates;
-
-use Schema;
-use October\Rain\Database\Updates\Migration;
-
-class CreateAddressesTable extends Migration
-{
-
-    public function up()
-    {
-        Schema::create('dshoreman_shop_addresses', function($table)
-        {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-            $table->string('name');
-            $table->string('street');
-            $table->string('town');
-            $table->string('county');
-            $table->string('postcode');
-            $table->string('country');
-            $table->timestamps();
-        });
-    }
-
-    public function down()
-    {
-        Schema::dropIfExists('dshoreman_shop_addresses');
-    }
-
-}
diff --git a/updates/create_orders_table.php b/updates/create_orders_table.php
index 2d2e01d..213b31d 100644
--- a/updates/create_orders_table.php
+++ b/updates/create_orders_table.php
@@ -13,16 +13,21 @@ public function up()
             $table->engine = 'InnoDB';
             $table->increments('id');
             $table->string('email');
-            $table->string('stripe_token');
-            $table->integer('billing_address')->unsigned();
-            $table->integer('shipping_address')->unsigned();
             $table->text('items');
             $table->decimal('total', 7, 2);
             $table->boolean('is_paid')->default(false);
+            $table->string('stripe_token');
+            $table->string('billing_name');
+            $table->string('billing_street');
+            $table->string('billing_town');
+            $table->string('billing_county');
+            $table->string('billing_postcode');
+            $table->string('shipping_name');
+            $table->string('shipping_street');
+            $table->string('shipping_town');
+            $table->string('shipping_county');
+            $table->string('shipping_postcode');
             $table->timestamps();
-
-            $table->foreign('billing_address')->references('id')->on('dshoreman_shop_addresses');
-            $table->foreign('shipping_address')->references('id')->on('dshoreman_shop_addresses');
         });
     }
 
diff --git a/updates/version.yaml b/updates/version.yaml
index d931719..786a37a 100644
--- a/updates/version.yaml
+++ b/updates/version.yaml
@@ -2,6 +2,5 @@
     - First version of Shop
     - create_categories_table.php
     - create_products_table.php
-    - create_addresses_table.php
     - create_orders_table.php
     - demo_seed.php