diff --git a/src/pizzeria/PizzaStore.java b/src/pizzeria/PizzaStore.java
index a43b5f73e219a60b3f5c394005a1cdcde14d4fc4..10c606763bda0c05649e729cb805735c0cec20b3 100644
--- a/src/pizzeria/PizzaStore.java
+++ b/src/pizzeria/PizzaStore.java
@@ -1,16 +1,11 @@
 package pizzeria;
 
 public class PizzaStore {
-	SimplePizzaFactory factory;
- 
-	public PizzaStore(SimplePizzaFactory factory) { 
-		this.factory = factory;
-	}
  
 	public Pizza orderPizza(String type) {
 		Pizza pizza;
  
-		pizza = factory.createPizza(type);
+		pizza = StaticSimplePizzaFactory.createPizza(type);
  
 		pizza.prepare();
 		pizza.bake();
@@ -20,27 +15,4 @@ public class PizzaStore {
 		return pizza;
 	}
 
-	public Pizza orderPizza() {
-		Pizza pizza;
-		
-		pizza = factory.createPizza();
-		pizza.prepare();
-		pizza.bake();
-		pizza.cut();
-		pizza.box();
-
-		return pizza;
-	}
-
-	public Pizza orderPepperoniPizza() {
-		Pizza pizza;
-		
-		pizza = factory.createPepperoniPizza();
-		pizza.prepare();
-		pizza.bake();
-		pizza.cut();
-		pizza.box();
-
-		return pizza;
-	}
 }
diff --git a/src/pizzeria/PizzaTestDrive.java b/src/pizzeria/PizzaTestDrive.java
index ae283e04fd9f26c07ba9d41c0c9beffce25a96ae..80dbd4b92b9aac3f061fd6a82fb5602ef83b1686 100644
--- a/src/pizzeria/PizzaTestDrive.java
+++ b/src/pizzeria/PizzaTestDrive.java
@@ -3,8 +3,7 @@ package pizzeria;
 public class PizzaTestDrive {
  
 	public static void main(String[] args) {
-		SimplePizzaFactory factory = new SimplePizzaFactory();
-		PizzaStore store = new PizzaStore(factory);
+		PizzaStore store = new PizzaStore();
 
 		Pizza pizza = store.orderPizza("cheese");
 		System.out.println("We ordered a " + pizza.getName() + "\n");
@@ -12,11 +11,5 @@ public class PizzaTestDrive {
 		pizza = store.orderPizza("veggie");
 		System.out.println("We ordered a " + pizza.getName() + "\n");
 
-		pizza = store.orderPepperoniPizza();
-		System.out.println("We ordered a " + pizza.getName() + "\n");
-
-		pizza = store.orderPizza();
-		System.out.println("We ordered a " + pizza.getName() + "\n");
-
 	}
 }
diff --git a/src/pizzeria/SimplePizzaFactory.java b/src/pizzeria/StaticSimplePizzaFactory.java
similarity index 61%
rename from src/pizzeria/SimplePizzaFactory.java
rename to src/pizzeria/StaticSimplePizzaFactory.java
index 22bbec1103c58f1f397b9ca50ed3b95d6c7c644e..23a6febe1167d59da7cdccee940ad8330533cbf9 100644
--- a/src/pizzeria/SimplePizzaFactory.java
+++ b/src/pizzeria/StaticSimplePizzaFactory.java
@@ -1,8 +1,8 @@
 package pizzeria;
 
-public class SimplePizzaFactory {
+public class StaticSimplePizzaFactory {
 
-	public Pizza createPizza(String type) {
+	public static Pizza createPizza(String type) {
 		Pizza pizza = null;
 
 		if (type.equals("cheese")) {
@@ -16,13 +16,4 @@ public class SimplePizzaFactory {
 		}
 		return pizza;
 	}
-
-	public Pizza createPizza() {
-		return new CheesePizza();
-	}
-	
-	public Pizza createPepperoniPizza() {
-		return new PepperoniPizza();
-	}
 }
-