Update doc and cleanup.