Remove extra lines here