Remove unused variables in J! 2.5 too