Remove LogFactory Dependency