Removed redudant factory