Merge "Remove old dependencies"