remove remaining m16s
recode A/AD bugfix