removed unneeded lines