A few more cleaning before starting the serious refactoring of the arm support