removed unused vars.