Fix issues raised by merging

This commit fixes garbled code resulting from a mistake during merging master
It also removes an in correctly named file that has since been replaced with a correctly spelled one.