Eliminate unused variables

Thanks to MP2E