more legacy removal