Removed obsolete files and fix Yo