Removing extraneous code

Deleting code that has been commented out
or is otherwise unused.