Removed obsolete files
Merge with development