Merge "Remove unused library dependency"