Removed obsolete files.
Merge origin/master