eliminate unused variables, fix CI build.