Removing AbstractFactory.  Code will go in Factory