Remove unused references

Refactor to use var