Removed old AD code