Finish the removal of unused variables