Merge "Remove dead var"