Remove extra remote call