remove more outdated code