Tidied up all redundant files and references