removed some unused vars