Get rid of more legacy stuff