Lint cleanup

Prevent "warning () interpreted as grouped expression" and remove two
unused variables