delete unused files
merge