removing more legacy stuff