More anidb removal