Removed some obsolete lines and broken links