removing several unneeded lines of code