clean up in aop files