Merge "Remove unnecessary dependency, and fix the chain"