deleted some uselss files
merge