Finally making taxonomy removal working in 0_5_X (backporting HCT-12)