remove some unused files, add missing files