Amf3Utils - misc cleanup