update from master
removed obsolete files