remove more outdated stuff