Removed unused vars
Removed unused vars