Draft:Cleanup unused variables

Simone Amorosorequested to merge
cleanup-unused-variables into master
  • Remove further unused files and variables

Merge request reports