First round of AD cleanups!