Removed dead and no-longer-used code, and updated docs.

Leo build: 20140828192152