Removed unnecessary factories.