Removing manual dependency.