Remove obsolete files and others minimal changes