Got rid of some old stuff, better variant support.