Removing extraneous behavior