Remove unneeded lines?