Removed some unused vars.