removing unused vars.