Removing now-unused code