Updating HEAD branch #3; more obsolete files removed.