Also remove corresponding unusedcode.easy entries and an
unusedcode.easy entry that I could not find in the master branch

Change-Id: If329fe1226bd40f86cc0fd8d912876bf7a7984b2