remove unneeded files and merge from master
not sure what this is