[16.1] Delete unused code