Remove backward compatibility of factories.

王权利请求将github/fork/kouno/cleanup-factories合并到master

Created by: kouno

Just a refactoring.

合并请求报告