Removed a bunch of extra stuff,

will add back to the wiki later.