fixed build errors and removed obsolete files
fixed build errors and removed obsolete files