Avoid: xxxx is not defined.
Remove unused variables