Remove unused block vars

Remove unused block vars