Removal of wip features