Removed old stuff, and done some cleanup in the documentation, and