Removed and Tidied up Junk.