Removal of redundant code