Remove extra &&'s