Merge "Remove dead path code"