AP11-102 clean up