Tidy up

Tidied up the code, removed some files