Removing some old relics