Cleanup in root dir.
Merge branch 'master' into offline

* master:
  Cleanup in root dir.