Removed old code and fixed a couple typos