Replace leftover variables