Removed the Factory

- The use of Guice replaces use of the factory