Removed legacy dependancies and misspellings.