removed unused vars