fix up adr handler
remove more junk