Unused variables

* Dropped unused and unnecessary vars