New upstream code
Don't fail if dir exists
Remove stuff thats now fixed
Force link