remo unused vars