Start removing of unused fore and reformatting of it.
Merge remote-tracking branch 'origin/master'

* origin/master:
  Start removing of unused fore and reformatting of it.