remove rows improved