Cleanup unused dependencies and update old ones

Lukas Geigerrequested to merge
cleanup into master

Just a bit of cleanup while going through the code

Merge request reports