Removal of deprecated functionality