removing unused vars