removed unused vars and imports