General Tidying

There were weird repeated files in the last commit. This is an attempt to remove
them.