remove some unused vars