Remove taxonomy dependency