Dupe files tidied up

Merge did something weird