[AOA] some cleaning of the angle of attack module