Tidied up files, removed un-needed