Removal of redundant code.