Removed unused factory. Tests passing