Now using the dropItems method everywhere

Thx to SonarQube