Removing "dead code"