Remove unused packages
Add new preferences and comments
Merge branch 'master' into work

* master:
  Add new preferences and comments
  Remove unused packages