Removed old factoryfactory