Tidied up some old remnants

Bits where I hadn't submoduled properly the first time and it was
shitting up my submodule pulls