Remove some outdated stuff