Removed unused ObjectFactory.