Stripped out unneeded lines