Fix previous mistake and remove some unneeded lines