Converted some comments to doc strings.
Got rid of some no=longer-used code.