removed some unneeded variable assignments