deleted a couple more unneeded lines