Remove left over lines.
Fix quoting for variable substitution.