Removed unused vars