Remove variables that were unused-but-set