local changes
merge fix
remove unneeded files