Removed unused vars and imports