cleanup + heli_para fix