remove unecessary files
merge