- remove target specific variant and use target->variant member