Fixed issue: Cleanup taxonomy from