Merge "Remove always-empty variable"