Removing unnused code