More doc, remove some cadaveric code.