ADDA and ADDB cleanup