fix cs, remove unnecessary variables