- Removing unnecessary vars