Copter: ACRO further clean up