Remove unused variables
Change sali to sal in test_irpp
Remove unused variable and some cleaning