Removed unnecessary factories