removin unneeded files
merge fix