remove more legacy